merge; provo eg mappings
authorTim L <lebot@rpi.edu>
Thu, 24 May 2012 21:51:11 -0400
changeset 2973 45a595d80e4c
parent 2972 82ae230202f7 (current diff)
parent 2971 43202696cf18 (diff)
child 2974 b2e354aee0a2
child 2995 e63fdf511029
merge; provo eg mappings
--- a/examples/eg-24-prov-o-html-examples/rdf/create/rdf/property_qualifiedInvalidation.ttl	Thu May 24 21:48:41 2012 -0400
+++ b/examples/eg-24-prov-o-html-examples/rdf/create/rdf/property_qualifiedInvalidation.ttl	Thu May 24 21:51:11 2012 -0400
@@ -4,4 +4,16 @@
 @prefix prov: <http://www.w3.org/ns/prov#> .
 @prefix :     <http://example.com/> .
 
-# TODO
+:the-Painter 
+   a prov:Entity, :Painting;
+   rdfs:label "Le Peintre"@fr, "The Painter"@en;
+   prov:wasAttributedTo <http://dbpedia.org/resource/Pablo_Picasso>;
+
+   prov:wasInvalidatedBy :swissair_Flight_111_crash;
+   prov:qualifiedInvalidation [
+      a prov:Invalidation;
+      prov:activity    :swissair_Flight_111_crash;
+      prov:atTime      "2012-09-02T01:31:00Z";
+      prov:atLocation  <http://toolserver.org/~geohack/geohack.php?pagename=Swissair_Flight_111&params=44_24_33_N_63_58_25_W_region:CA-NS_type:landmark_scale:500000>;
+   ];
+. 
\ No newline at end of file
--- a/model/diff.html	Thu May 24 21:48:41 2012 -0400
+++ b/model/diff.html	Thu May 24 21:51:11 2012 -0400
@@ -12,9 +12,36 @@
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> 
     
 
+     
+    
+
+
     <style type="text/css">
       .note { font-size:small; margin-left:50px }
-     </style>
+     <span class="insert">
+
+table.thinborder {
+	border-width: 1px;
+	border-spacing: 0px;
+	border-style: none;
+	border-color: gray;
+	border-collapse: collapse;
+}
+table.thinborder th {
+	border-width: 1px;
+	padding: 0px;
+	border-style: solid;
+	border-color: gray;
+	-moz-border-radius: ;
+}
+table.thinborder td {
+	border-width: 1px;
+	padding: 2px;
+	border-style: solid;
+	border-color: gray;
+	-moz-border-radius: ;
+}
+</span></style>
 
      
      
@@ -917,7 +944,7 @@
     font-weight:    bold;
 }
 </span></style><link href="./extra-dm.css" rel="stylesheet" type="text/css" charset="utf-8"><link href="http://www.w3.org/StyleSheets/TR/W3C-ED" rel="stylesheet" type="text/css" charset="utf-8"></head> 
-  <body style="display: inherit; "><div class="head"><p><a href="http://www.w3.org/"><img width="72" height="48" src="http://www.w3.org/Icons/w3c_home" alt="W3C"></a></p><h1 class="title" id="title">PROV-DM: The PROV Data Model</h1><h2 id="subtitle"><span class="insert">working towards WD6 (</span><a href="diff.html"><span class="insert">Diffs since last release</span></a><span class="insert">)</span></h2><h2 id="w3c-editor-s-draft-23-may-2012"><acronym title="World Wide Web Consortium">W3C</acronym> <span class="delete">Working</span><span class="insert">Editor's</span> Draft <span class="delete">03</span><span class="insert">23</span> May 2012</h2><dl><dt>This version:</dt><dd><span class="delete">http://www.w3.org/TR/2012/WD-prov-dm-20120503/</span><a href="http://dvcs.w3.org/hg/prov/raw-file/default/model/prov-dm.html"><span class="insert">http://dvcs.w3.org/hg/prov/raw-file/default/model/prov-dm.html</span></a></dd><dt>Latest published version:</dt><dd><a href="http://www.w3.org/TR/prov-dm/">http://www.w3.org/TR/prov-dm/</a></dd><dt>Latest editor's draft:</dt><dd><a href="http://dvcs.w3.org/hg/prov/raw-file/default/model/prov-dm.html">http://dvcs.w3.org/hg/prov/raw-file/default/model/prov-dm.html</a></dd><dt>Previous version:</dt><dd><span class="delete">http://www.w3.org/TR/2012/WD-prov-dm-20120202/</span><a href="http://www.w3.org/TR/2012/WD-prov-dm-20120503/"><span class="insert">http://www.w3.org/TR/2012/WD-prov-dm-20120503/</span></a></dd><dt>Editors:</dt><dd><a href="http://www.ecs.soton.ac.uk/~lavm/">Luc Moreau</a>, University of Southampton</dd>
+  <body style="display: inherit; "><div class="head"><p><a href="http://www.w3.org/"><img width="72" height="48" src="http://www.w3.org/Icons/w3c_home" alt="W3C"></a></p><h1 class="title" id="title">PROV-DM: The PROV Data Model</h1><h2 id="subtitle"><span class="insert">working towards WD6 (</span><a href="diff.html"><span class="insert">Diffs since last release</span></a><span class="insert">)</span></h2><h2 id="w3c-editor-s-draft-24-may-2012"><acronym title="World Wide Web Consortium">W3C</acronym> <span class="delete">Working</span><span class="insert">Editor's</span> Draft <span class="delete">03</span><span class="insert">24</span> May 2012</h2><dl><dt>This version:</dt><dd><span class="delete">http://www.w3.org/TR/2012/WD-prov-dm-20120503/</span><a href="http://dvcs.w3.org/hg/prov/raw-file/default/model/prov-dm.html"><span class="insert">http://dvcs.w3.org/hg/prov/raw-file/default/model/prov-dm.html</span></a></dd><dt>Latest published version:</dt><dd><a href="http://www.w3.org/TR/prov-dm/">http://www.w3.org/TR/prov-dm/</a></dd><dt>Latest editor's draft:</dt><dd><a href="http://dvcs.w3.org/hg/prov/raw-file/default/model/prov-dm.html">http://dvcs.w3.org/hg/prov/raw-file/default/model/prov-dm.html</a></dd><dt>Previous version:</dt><dd><span class="delete">http://www.w3.org/TR/2012/WD-prov-dm-20120202/</span><a href="http://www.w3.org/TR/2012/WD-prov-dm-20120503/"><span class="insert">http://www.w3.org/TR/2012/WD-prov-dm-20120503/</span></a></dd><dt>Editors:</dt><dd><a href="http://www.ecs.soton.ac.uk/~lavm/">Luc Moreau</a>, University of Southampton</dd>
 <dd><a href="http://www.cs.ncl.ac.uk/people/Paolo.Missier">Paolo Missier</a>, Newcastle University</dd>
 <dt><span class="delete">Contributors:</span><span class="insert">Authors:</span></dt><dd><a href="http://semanticweb.org/wiki/Khalid_Belhajjame">Khalid Belhajjame</a>, University of Manchester</dd>
 <dd><span>Reza B'Far</span>, Oracle Corporation</dd>
@@ -934,7 +961,7 @@
 
     <div id="abstract" class="introductory section"><h2>Abstract</h2>
 <p>
-PROV-DM, the PROV data model, is a data model for provenance that describes
+PROV-DM, the PROV <span class="insert">conceptual </span>data model, is a data model for provenance that describes
 the entities, people and activities involved in
 producing a piece of data or thing. 
 PROV-DM <span class="insert">distinguishes core structures, forming the essence of provenance descriptions, from
@@ -944,7 +971,7 @@
 (2) agents bearing responsibility for entities that were generated and activities that happened;
 (3) derivations of entities from entities;
 (4) properties to link entities that refer to the same thing;
-(5) <span class="insert">notion of bundle, a mechanism to support provenance of provenance;
+(5) <span class="insert">a notion of bundle, a mechanism to support provenance of provenance; and,
 (6) </span>collections forming a logical structure for its <span class="delete">members;
 (6) a simple annotation mechanism.</span><span class="insert">members.</span>
 </p>
@@ -962,6 +989,15 @@
 this document. </p>
 
     </div><div id="sotd" class="introductory section"><h2>Status of This Document</h2><p><em>This section describes the status of this document at the time of its publication. Other documents may supersede this document. A list of current <acronym title="World Wide Web Consortium">W3C</acronym> publications and the latest revision of this technical report can be found in the <a href="http://www.w3.org/TR/"><acronym title="World Wide Web Consortium">W3C</acronym> technical reports index</a> at http://www.w3.org/TR/.</em></p>
+<h4 id="intended-to-be-last-call--tbc"><span class="insert">Intended to be Last Call (TBC)</span></h4>
+<p><span class="insert">This is the fifth public release of the PROV-DM document. 
+Publication as Last Call working draft means that 
+the Working Group believes that it has satisfied the relevant technical requirements outlined in its charter on this document. The design is not expected to change significantly, going forward, and now is the key time for external review, before the implementation phase.</span></p>
+<h4 id="please-comment-by--date-tbd"><span class="insert">Please Comment By (date TBD)</span></h4>
+<p><span class="insert">The PROV Working group seeks public feedback on this Working Draft.
+The end date of the Last Call review period is TBD, and we would appreciate comments by that date to public-prov-comments@w3.org
+</span></p>
+
 <h4 id="prov-family-of-specifications">PROV Family of Specifications</h4>
 This document is part of the PROV family of specifications, a set of specifications defining various aspects that are necessary to achieve the vision of inter-operable
 interchange of provenance information in heterogeneous environments such as the Web.  The specifications are:
@@ -986,10 +1022,10 @@
 </ul>
 
 
-<h4 id="fourth-public-working-draft">Fourth Public Working Draft</h4>
-<p>This is the fourth public release of the PROV-DM document. Following feedback, the Working Group has decided to reorganize this document substantially, separating the data model from its contraints and the notation used to illustrate it. The PROV-DM release is synchronized with the release of the PROV-O, PROV-PRIMER, PROV-N, and PROV-CONSTRAINTS documents. We are now clarifying the entry path to the PROV family of specifications.</p>
-<p>This document was published by the <a href="http://www.w3.org/2011/prov/">Provenance Working Group</a> as <span class="delete">a Working</span><span class="insert">an Editor's</span> Draft.<span class="delete"> This document is intended to become a </span><span class="delete">W3C</span><span class="delete"> Recommendation.</span> If you wish to make comments regarding this document, please send them to <a href="mailto:public-prov-wg@w3.org">public-prov-wg@w3.org</a> (<a href="mailto:public-prov-wg-request@w3.org?subject=subscribe">subscribe</a>, <a href="http://lists.w3.org/Archives/Public/public-prov-wg/">archives</a>). All feedback is welcome.</p><p>Publication as <span class="delete">a Working</span><span class="insert">an Editor's</span> 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<br>
-</a><ul class="toc"><li class="tocline"><a href="#structure-of-this-document" class="tocxref"><span class="secno">1.1 </span>Structure of this Document</a></li><li class="tocline"><a href="#conventions" class="tocxref"><span class="secno">1.2 </span>Notational Conventions</a></li></ul></li><li class="tocline"><a href="#section-prov-overview" class="tocxref"><span class="secno">2. </span>PROV <span class="delete">Starting Points</span><span class="insert">Overview</span></a><ul class="toc"><li class="tocline"><a href="#core-structures" class="tocxref"><span class="secno"><span class="insert">2.1 </span></span><span class="insert">PROV Core Structures</span></a><ul class="toc"><li class="tocline"><a href="#section-entity-activity" class="tocxref"><span class="secno"><span class="delete">2.1</span><span class="insert">2.1.1</span> </span>Entity and Activity<span class="delete">2.2 </span><span class="delete">Generation, Usage, Derivation</span></a></li><li class="tocline"><a href="#section-agents-attribution-association-responsibility" class="tocxref"><span class="secno"><span class="delete">2.3 </span><span class="delete">Agents, Attribution, Association,</span><span class="insert">2.1.2 </span></span><span class="insert">Agents</span> and Responsibility</a></li><li class="tocline"><a href="#section-derivation" class="tocxref"><span class="secno"><span class="delete">2.4 </span><span class="delete">Further Entities: Collections and Accounts</span><span class="delete">2.5 </span><span class="delete">Simplified Overview Diagram</span><span class="delete">2.6 </span><span class="delete">PROV-N: The Provenance Notation</span><span class="insert">2.1.3 </span></span><span class="insert">Derivation</span></a></li></ul></li><li class="tocline"><a href="#section-extended-structures" class="tocxref"><span class="secno"><span class="insert">2.2 </span></span><span class="insert">PROV Extended Structures</span></a><ul class="toc"><li class="tocline"><a href="#section-prov-extended-mechanisms" class="tocxref"><span class="secno"><span class="insert">2.2.1 </span></span><span class="insert">Mechanisms to Define Extended Structures</span></a><ul class="toc"><li class="tocline"><a href="#section-prov-extended-approach-subtyping" class="tocxref"><span class="secno"><span class="insert">2.2.1.1 </span></span><span class="insert">Subtyping</span></a></li><li class="tocline"><a href="#section-prov-extended-approach-expanded-relation" class="tocxref"><span class="secno"><span class="insert">2.2.1.2 </span></span><span class="insert">Expanded Relations</span></a></li><li class="tocline"><a href="#section-prov-extended-approach-optional-identification-new-relation" class="tocxref"><span class="secno"><span class="insert">2.2.1.3 </span></span><span class="insert">Optional Identification and New Relations</span></a></li></ul></li><li class="tocline"><a href="#section-provenance-of-provnance" class="tocxref"><span class="secno"><span class="insert">2.2.2 </span></span><span class="insert">Provenance of Provenance</span></a></li><li class="tocline"><a href="#section-collections" class="tocxref"><span class="secno"><span class="insert">2.2.3 </span></span><span class="insert">Collections</span></a></li></ul></li><li class="tocline"><a href="#section-overview-components" class="tocxref"><span class="secno"><span class="insert">2.3 </span></span><span class="insert">Modular Organization</span></a></li></ul></li><li class="tocline"><a href="#prov-notation" class="tocxref"><span class="secno"><span class="insert">3. </span></span><span class="insert">The Provenance Notation</span></a></li><li class="tocline"><a href="#prov-dm-example" class="tocxref"><span class="secno"><span class="delete">3.</span><span class="insert">4.</span> </span>Illustration of PROV-DM by an Example</a><ul class="toc"><li class="tocline"><a href="#section-example-one" class="tocxref"><span class="secno"><span class="delete">3.1</span><span class="insert">4.1</span> </span>The Authors View</a></li><li class="tocline"><a href="#section-example-two" class="tocxref"><span class="secno"><span class="delete">3.2</span><span class="insert">4.2</span> </span>The Process View</a></li><li class="tocline"><a href="#section-example-c" class="tocxref"><span class="secno"><span class="delete">3.3</span><span class="insert">4.3</span> </span>Attribution of Provenance</a></li></ul></li><li class="tocline"><a href="#data-model-components" class="tocxref"><span class="secno"><span class="delete">4.</span><span class="insert">5.</span> </span>PROV-DM Types and Relations</a><ul class="toc"><li class="tocline"><a href="#component1" class="tocxref"><span class="secno"><span class="delete">4.1</span><span class="insert">5.1</span> </span>Component 1: Entities and Activities</a><ul class="toc"><li class="tocline"><a href="#term-Entity" class="tocxref"><span class="secno"><span class="delete">4.1.1</span><span class="insert">5.1.1</span> </span>Entity</a></li><li class="tocline"><a href="#term-Activity" class="tocxref"><span class="secno"><span class="delete">4.1.2</span><span class="insert">5.1.2</span> </span>Activity</a></li><li class="tocline"><a href="#term-Generation" class="tocxref"><span class="secno"><span class="delete">4.1.3</span><span class="insert">5.1.3</span> </span>Generation</a></li><li class="tocline"><a href="#term-Usage" class="tocxref"><span class="secno"><span class="delete">4.1.4</span><span class="insert">5.1.4</span> </span>Usage</a></li><li class="tocline"><a href="#term-Start" class="tocxref"><span class="secno"><span class="delete">4.1.5</span><span class="insert">5.1.5</span> </span>Start</a></li><li class="tocline"><a href="#term-End" class="tocxref"><span class="secno"><span class="delete">4.1.6</span><span class="insert">5.1.6</span> </span>End</a></li><li class="tocline"><a href="#term-Invalidation" class="tocxref"><span class="secno"><span class="delete">4.1.7</span><span class="insert">5.1.7</span> </span>Invalidation</a></li><li class="tocline"><a href="#term-wasInformedBy" class="tocxref"><span class="secno"><span class="delete">4.1.8</span><span class="insert">5.1.8</span> </span>Communication<span class="delete">4.1.9 </span><span class="delete">Start by Activity</span></a></li></ul></li><li class="tocline"><a href="#component2" class="tocxref"><span class="secno"><span class="delete">4.2</span><span class="insert">5.2</span> </span>Component 2: Agents and Responsibility</a><ul class="toc"><li class="tocline"><a href="#term-Agent" class="tocxref"><span class="secno"><span class="delete">4.2.1</span><span class="insert">5.2.1</span> </span>Agent</a></li><li class="tocline"><a href="#term-attribution" class="tocxref"><span class="secno"><span class="delete">4.2.2</span><span class="insert">5.2.2</span> </span>Attribution</a></li><li class="tocline"><a href="#term-ActivityAssociation" class="tocxref"><span class="secno"><span class="delete">4.2.3</span><span class="insert">5.2.3</span> </span>Association</a></li><li class="tocline"><a href="#term-responsibility" class="tocxref"><span class="secno"><span class="delete">4.2.4</span><span class="insert">5.2.4</span> </span>Responsibility</a></li></ul></li><li class="tocline"><a href="#component3" class="tocxref"><span class="secno"><span class="delete">4.3</span><span class="insert">5.3</span> </span>Component 3: Derivations</a><ul class="toc"><li class="tocline"><a href="#Derivation-Relation" class="tocxref"><span class="secno"><span class="delete">4.3.1</span><span class="insert">5.3.1</span> </span>Derivation</a></li><li class="tocline"><a href="#term-Revision" class="tocxref"><span class="secno"><span class="delete">4.3.2</span><span class="insert">5.3.2</span> </span>Revision</a></li><li class="tocline"><a href="#term-quotation" class="tocxref"><span class="secno"><span class="delete">4.3.3</span><span class="insert">5.3.3</span> </span>Quotation</a></li><li class="tocline"><a href="#term-original-source" class="tocxref"><span class="secno"><span class="delete">4.3.4</span><span class="insert">5.3.4</span> </span>Original Source</a></li><li class="tocline"><a href="#term-trace" class="tocxref"><span class="secno"><span class="delete">4.3.5</span><span class="insert">5.3.5</span> </span>Trace</a></li></ul></li><li class="tocline"><a href="#component4" class="tocxref"><span class="secno"><span class="delete">4.4</span><span class="insert">5.4</span> </span>Component 4: Alternate Entities</a><ul class="toc"><li class="tocline"><a href="#term-specialization" class="tocxref"><span class="secno"><span class="delete">4.4.1</span><span class="insert">5.4.1</span> </span>Specialization</a></li><li class="tocline"><a href="#term-alternate" class="tocxref"><span class="secno"><span class="delete">4.4.2</span><span class="insert">5.4.2</span> </span>Alternate</a></li></ul></li><li class="tocline"><a href="#component5" class="tocxref"><span class="secno"><span class="delete">4.5</span><span class="insert">5.5</span> </span>Component 5: <span class="delete">Collections</span><span class="insert">Bundles</span></a><ul class="toc"><li class="tocline"><a href="#term-bundle" class="tocxref"><span class="secno"><span class="delete">4.5.1 </span><span class="delete">Collection</span><span class="insert">5.5.1 </span></span><span class="insert">Bundle constructor</span></a></li><li class="tocline"><a href="#term-bundle-entity" class="tocxref"><span class="secno"><span class="delete">4.5.2 </span><span class="delete">Dictionary</span><span class="insert">5.5.2 </span></span><span class="insert">Bundle Description</span></a></li><li class="tocline"><a href="#term-hasProvenanceIn" class="tocxref"><span class="secno"><span class="delete">4.5.3 </span><span class="delete">Insertion</span><span class="delete">4.5.4 </span><span class="delete">Removal</span><span class="delete">4.5.5 </span><span class="delete">Membership</span><span class="insert">5.5.3 </span></span><span class="insert">Provenance Locator</span></a></li></ul></li><li class="tocline"><a href="#component6" class="tocxref"><span class="secno"><span class="delete">4.6</span><span class="insert">5.6</span> </span>Component 6: <span class="delete">Annotations</span><span class="insert">Collections</span></a><ul class="toc"><li class="tocline"><a href="#term-collection" class="tocxref"><span class="secno"><span class="delete">4.6.1 </span><span class="delete">Note</span><span class="insert">5.6.1 </span></span><span class="insert">Collection</span></a></li><li class="tocline"><a href="#term-dictinonary" class="tocxref"><span class="secno"><span class="delete">4.6.2 </span><span class="delete">Annotation</span><span class="insert">5.6.2 </span></span><span class="insert">Dictionary</span></a></li><li class="tocline"><a href="#term-dictionary-insertion" class="tocxref"><span class="secno"><span class="insert">5.6.3 </span></span><span class="insert">Insertion</span></a></li><li class="tocline"><a href="#term-dictionary-removal" class="tocxref"><span class="secno"><span class="insert">5.6.4 </span></span><span class="insert">Removal</span></a></li><li class="tocline"><a href="#term-dictionary-membership" class="tocxref"><span class="secno"><span class="insert">5.6.5 </span></span><span class="insert">Membership</span></a></li></ul></li><li class="tocline"><a href="#second-class-elements" class="tocxref"><span class="secno"><span class="delete">4.7</span><span class="insert">5.7</span> </span>Further Elements of PROV-DM</a><ul class="toc"><li class="tocline"><a href="#term-NamespaceDeclaration" class="tocxref"><span class="secno"><span class="delete">4.7.1</span><span class="insert">5.7.1</span> </span>Namespace Declaration</a></li><li class="tocline"><a href="#term-qualified-name" class="tocxref"><span class="secno"><span class="delete">4.7.2</span><span class="insert">5.7.2</span> </span>Qualified Name</a></li><li class="tocline"><a href="#term-identifier" class="tocxref"><span class="secno"><span class="delete">4.7.3</span><span class="insert">5.7.3</span> </span>Identifier</a></li><li class="tocline"><a href="#term-attribute" class="tocxref"><span class="secno"><span class="delete">4.7.4</span><span class="insert">5.7.4</span> </span>Attribute</a><ul class="toc"><li class="tocline"><a href="#term-attribute-label" class="tocxref"><span class="secno"><span class="delete">4.7.4.1</span><span class="insert">5.7.4.1</span> </span>prov:label</a></li><li class="tocline"><a href="#term-attribute-location" class="tocxref"><span class="secno"><span class="delete">4.7.4.2</span><span class="insert">5.7.4.2</span> </span>prov:location</a></li><li class="tocline"><a href="#term-attribute-role" class="tocxref"><span class="secno"><span class="delete">4.7.4.3</span><span class="insert">5.7.4.3</span> </span>prov:role</a></li><li class="tocline"><a href="#term-attribute-type" class="tocxref"><span class="secno"><span class="delete">4.7.4.4</span><span class="insert">5.7.4.4</span> </span>prov:type</a></li><li class="tocline"><a href="#term-attribute-value" class="tocxref"><span class="secno"><span class="delete">4.7.4.5</span><span class="insert">5.7.4.5</span> </span>prov:value</a></li></ul></li><li class="tocline"><a href="#term-value" class="tocxref"><span class="secno"><span class="delete">4.7.5</span><span class="insert">5.7.5</span> </span>Value</a></li></ul></li></ul></li><li class="tocline"><a href="#extensibility-section" class="tocxref"><span class="secno"><span class="delete">5.</span><span class="insert">6.</span> </span>PROV-DM Extensibility Points</a></li><li class="tocline"><a href="#valid-provenance" class="tocxref"><span class="secno"><span class="delete">6.</span><span class="insert">7.</span> </span>Creating Valid Provenance</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> 
+<span class="delete">Fourth Public Working Draft</span>
+<p>This <span class="delete">is the fourth public release of the PROV-DM document. Following feedback, the Working Group has decided to reorganize this document substantially, separating the data model from its contraints and the notation used to illustrate it. The PROV-DM release is synchronized with the release of the PROV-O, PROV-PRIMER, PROV-N, and PROV-CONSTRAINTS documents. We are now clarifying the entry path to the PROV family of specifications.</span>
+<span class="delete">This </span>document was published by the <a href="http://www.w3.org/2011/prov/">Provenance Working Group</a> as <span class="delete">a Working</span><span class="insert">an Editor's</span> Draft. <span class="delete">This document is intended</span><span class="insert">If you wish</span> to <span class="delete">become a </span><span class="delete">W3C</span><span class="delete"> Recommendation. If you wish</span><span class="insert">make comments regarding this document, please send them</span> to <span class="delete">make comments regarding this document, please send them to </span><span class="delete">public-prov-wg@w3.org</span><a href="mailto:public-prov-comments@w3.org"><span class="insert">public-prov-comments@w3.org</span></a> (<a href="mailto:public-prov-comments-request@w3.org?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 <span class="delete">a Working</span><span class="insert">an Editor's</span> 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<br>
+</a><ul class="toc"><li class="tocline"><a href="#structure-of-this-document" class="tocxref"><span class="secno">1.1 </span>Structure of this Document</a></li><li class="tocline"><a href="#conventions" class="tocxref"><span class="secno">1.2 </span>Notational Conventions</a></li></ul></li><li class="tocline"><a href="#section-prov-overview" class="tocxref"><span class="secno">2. </span>PROV <span class="delete">Starting Points</span><span class="insert">Overview</span></a><ul class="toc"><li class="tocline"><a href="#core-structures" class="tocxref"><span class="secno"><span class="insert">2.1 </span></span><span class="insert">PROV Core Structures</span></a><ul class="toc"><li class="tocline"><a href="#section-entity-activity" class="tocxref"><span class="secno"><span class="delete">2.1</span><span class="insert">2.1.1</span> </span>Entity and Activity</a></li><li class="tocline"><a href="#section-agents-attribution-association-delegation" class="tocxref"><span class="secno"><span class="delete">2.2 </span><span class="delete">Generation, Usage, Derivation</span><span class="insert">2.1.2 </span></span><span class="insert">Agents and Responsibility</span></a></li><li class="tocline"><a href="#section-derivation" class="tocxref"><span class="secno"><span class="delete">2.3 </span><span class="delete">Agents, Attribution, Association, and Responsibility</span><span class="delete">2.4 </span><span class="delete">Further Entities: Collections and Accounts</span><span class="delete">2.5 </span><span class="delete">Simplified Overview Diagram</span><span class="delete">2.6 </span><span class="delete">PROV-N: The Provenance Notation</span><span class="insert">2.1.3 </span></span><span class="insert">Derivation</span></a></li></ul></li><li class="tocline"><a href="#section-extended-structures" class="tocxref"><span class="secno"><span class="insert">2.2 </span></span><span class="insert">PROV Extended Structures</span></a><ul class="toc"><li class="tocline"><a href="#section-prov-extended-mechanisms" class="tocxref"><span class="secno"><span class="insert">2.2.1 </span></span><span class="insert">Mechanisms to Define Extended Structures</span></a><ul class="toc"><li class="tocline"><a href="#section-prov-extended-approach-subtyping" class="tocxref"><span class="secno"><span class="insert">2.2.1.1 </span></span><span class="insert">Subtyping</span></a></li><li class="tocline"><a href="#section-prov-extended-approach-expanded-relation" class="tocxref"><span class="secno"><span class="insert">2.2.1.2 </span></span><span class="insert">Expanded Relations</span></a></li><li class="tocline"><a href="#section-prov-extended-approach-optional-identification-new-relation" class="tocxref"><span class="secno"><span class="insert">2.2.1.3 </span></span><span class="insert">Optional Identification and New Relations</span></a></li></ul></li><li class="tocline"><a href="#section-provenance-of-provnance" class="tocxref"><span class="secno"><span class="insert">2.2.2 </span></span><span class="insert">Provenance of Provenance</span></a></li><li class="tocline"><a href="#section-collections" class="tocxref"><span class="secno"><span class="insert">2.2.3 </span></span><span class="insert">Collections</span></a></li></ul></li><li class="tocline"><a href="#section-overview-components" class="tocxref"><span class="secno"><span class="insert">2.3 </span></span><span class="insert">Modular Organization</span></a></li></ul></li><li class="tocline"><a href="#prov-notation" class="tocxref"><span class="secno"><span class="insert">3. </span></span><span class="insert">The Provenance Notation</span></a></li><li class="tocline"><a href="#prov-dm-example" class="tocxref"><span class="secno"><span class="delete">3.</span><span class="insert">4.</span> </span>Illustration of PROV-DM by an Example</a><ul class="toc"><li class="tocline"><a href="#section-example-one" class="tocxref"><span class="secno"><span class="delete">3.1</span><span class="insert">4.1</span> </span>The Authors View</a></li><li class="tocline"><a href="#section-example-two" class="tocxref"><span class="secno"><span class="delete">3.2</span><span class="insert">4.2</span> </span>The Process View</a></li><li class="tocline"><a href="#section-example-c" class="tocxref"><span class="secno"><span class="delete">3.3</span><span class="insert">4.3</span> </span>Attribution of Provenance</a></li></ul></li><li class="tocline"><a href="#data-model-components" class="tocxref"><span class="secno"><span class="delete">4.</span><span class="insert">5.</span> </span>PROV-DM Types and Relations</a><ul class="toc"><li class="tocline"><a href="#component1" class="tocxref"><span class="secno"><span class="delete">4.1</span><span class="insert">5.1</span> </span>Component 1: Entities and Activities</a><ul class="toc"><li class="tocline"><a href="#term-Entity" class="tocxref"><span class="secno"><span class="delete">4.1.1</span><span class="insert">5.1.1</span> </span>Entity</a></li><li class="tocline"><a href="#term-Activity" class="tocxref"><span class="secno"><span class="delete">4.1.2</span><span class="insert">5.1.2</span> </span>Activity</a></li><li class="tocline"><a href="#term-Generation" class="tocxref"><span class="secno"><span class="delete">4.1.3</span><span class="insert">5.1.3</span> </span>Generation</a></li><li class="tocline"><a href="#term-Usage" class="tocxref"><span class="secno"><span class="delete">4.1.4</span><span class="insert">5.1.4</span> </span>Usage</a></li><li class="tocline"><a href="#term-wasInformedBy" class="tocxref"><span class="secno"><span class="insert">5.1.5 </span></span><span class="insert">Communication</span></a></li><li class="tocline"><a href="#term-Start" class="tocxref"><span class="secno"><span class="delete">4.1.5</span><span class="insert">5.1.6</span> </span>Start</a></li><li class="tocline"><a href="#term-End" class="tocxref"><span class="secno"><span class="delete">4.1.6</span><span class="insert">5.1.7</span> </span>End</a></li><li class="tocline"><a href="#term-Invalidation" class="tocxref"><span class="secno"><span class="delete">4.1.7</span><span class="insert">5.1.8</span> </span>Invalidation<span class="delete">4.1.8 </span><span class="delete">Communication</span><span class="delete">4.1.9 </span><span class="delete">Start by Activity</span></a></li></ul></li><li class="tocline"><a href="#component2" class="tocxref"><span class="secno"><span class="delete">4.2</span><span class="insert">5.2</span> </span>Component 2: Agents and Responsibility</a><ul class="toc"><li class="tocline"><a href="#term-Agent" class="tocxref"><span class="secno"><span class="delete">4.2.1</span><span class="insert">5.2.1</span> </span>Agent</a></li><li class="tocline"><a href="#term-attribution" class="tocxref"><span class="secno"><span class="delete">4.2.2</span><span class="insert">5.2.2</span> </span>Attribution</a></li><li class="tocline"><a href="#term-ActivityAssociation" class="tocxref"><span class="secno"><span class="delete">4.2.3</span><span class="insert">5.2.3</span> </span>Association</a></li><li class="tocline"><a href="#term-delegation" class="tocxref"><span class="secno"><span class="delete">4.2.4 </span><span class="delete">Responsibility</span><span class="insert">5.2.4 </span></span><span class="insert">Delegation</span></a></li></ul></li><li class="tocline"><a href="#component3" class="tocxref"><span class="secno"><span class="delete">4.3</span><span class="insert">5.3</span> </span>Component 3: Derivations</a><ul class="toc"><li class="tocline"><a href="#Derivation-Relation" class="tocxref"><span class="secno"><span class="delete">4.3.1</span><span class="insert">5.3.1</span> </span>Derivation</a></li><li class="tocline"><a href="#term-Revision" class="tocxref"><span class="secno"><span class="delete">4.3.2</span><span class="insert">5.3.2</span> </span>Revision</a></li><li class="tocline"><a href="#term-quotation" class="tocxref"><span class="secno"><span class="delete">4.3.3</span><span class="insert">5.3.3</span> </span>Quotation</a></li><li class="tocline"><a href="#term-original-source" class="tocxref"><span class="secno"><span class="delete">4.3.4</span><span class="insert">5.3.4</span> </span>Original Source</a></li><li class="tocline"><a href="#term-trace" class="tocxref"><span class="secno"><span class="delete">4.3.5</span><span class="insert">5.3.5</span> </span>Trace</a></li></ul></li><li class="tocline"><a href="#component4" class="tocxref"><span class="secno"><span class="delete">4.4</span><span class="insert">5.4</span> </span>Component 4: Alternate Entities</a><ul class="toc"><li class="tocline"><a href="#term-specialization" class="tocxref"><span class="secno"><span class="delete">4.4.1</span><span class="insert">5.4.1</span> </span>Specialization</a></li><li class="tocline"><a href="#term-alternate" class="tocxref"><span class="secno"><span class="delete">4.4.2</span><span class="insert">5.4.2</span> </span>Alternate</a></li></ul></li><li class="tocline"><a href="#component5" class="tocxref"><span class="secno"><span class="delete">4.5</span><span class="insert">5.5</span> </span>Component 5: <span class="delete">Collections</span><span class="insert">Bundles</span></a><ul class="toc"><li class="tocline"><a href="#term-bundle" class="tocxref"><span class="secno"><span class="delete">4.5.1 </span><span class="delete">Collection</span><span class="insert">5.5.1 </span></span><span class="insert">Bundle constructor</span></a></li><li class="tocline"><a href="#term-bundle-entity" class="tocxref"><span class="secno"><span class="delete">4.5.2 </span><span class="delete">Dictionary</span><span class="insert">5.5.2 </span></span><span class="insert">Bundle Description</span></a></li><li class="tocline"><a href="#term-hasProvenanceIn" class="tocxref"><span class="secno"><span class="delete">4.5.3 </span><span class="delete">Insertion</span><span class="delete">4.5.4 </span><span class="delete">Removal</span><span class="delete">4.5.5 </span><span class="delete">Membership</span><span class="insert">5.5.3 </span></span><span class="insert">Provenance Locator</span></a></li></ul></li><li class="tocline"><a href="#component6" class="tocxref"><span class="secno"><span class="delete">4.6</span><span class="insert">5.6</span> </span>Component 6: <span class="delete">Annotations</span><span class="insert">Collections</span></a><ul class="toc"><li class="tocline"><a href="#term-collection" class="tocxref"><span class="secno"><span class="delete">4.6.1 </span><span class="delete">Note</span><span class="insert">5.6.1 </span></span><span class="insert">Collection</span></a></li><li class="tocline"><a href="#term-dictinonary" class="tocxref"><span class="secno"><span class="delete">4.6.2 </span><span class="delete">Annotation</span><span class="insert">5.6.2 </span></span><span class="insert">Dictionary</span></a></li><li class="tocline"><a href="#term-dictionary-insertion" class="tocxref"><span class="secno"><span class="insert">5.6.3 </span></span><span class="insert">Insertion</span></a></li><li class="tocline"><a href="#term-dictionary-removal" class="tocxref"><span class="secno"><span class="insert">5.6.4 </span></span><span class="insert">Removal</span></a></li><li class="tocline"><a href="#term-dictionary-membership" class="tocxref"><span class="secno"><span class="insert">5.6.5 </span></span><span class="insert">Membership</span></a></li></ul></li><li class="tocline"><a href="#second-class-elements" class="tocxref"><span class="secno"><span class="delete">4.7</span><span class="insert">5.7</span> </span>Further Elements of PROV-DM</a><ul class="toc"><li class="tocline"><a href="#term-NamespaceDeclaration" class="tocxref"><span class="secno"><span class="delete">4.7.1</span><span class="insert">5.7.1</span> </span>Namespace Declaration</a></li><li class="tocline"><a href="#term-qualified-name" class="tocxref"><span class="secno"><span class="delete">4.7.2</span><span class="insert">5.7.2</span> </span>Qualified Name</a></li><li class="tocline"><a href="#term-identifier" class="tocxref"><span class="secno"><span class="delete">4.7.3</span><span class="insert">5.7.3</span> </span>Identifier</a></li><li class="tocline"><a href="#term-attribute" class="tocxref"><span class="secno"><span class="delete">4.7.4</span><span class="insert">5.7.4</span> </span>Attribute</a><ul class="toc"><li class="tocline"><a href="#term-attribute-label" class="tocxref"><span class="secno"><span class="delete">4.7.4.1</span><span class="insert">5.7.4.1</span> </span>prov:label</a></li><li class="tocline"><a href="#term-attribute-location" class="tocxref"><span class="secno"><span class="delete">4.7.4.2</span><span class="insert">5.7.4.2</span> </span>prov:location</a></li><li class="tocline"><a href="#term-attribute-role" class="tocxref"><span class="secno"><span class="delete">4.7.4.3</span><span class="insert">5.7.4.3</span> </span>prov:role</a></li><li class="tocline"><a href="#term-attribute-type" class="tocxref"><span class="secno"><span class="delete">4.7.4.4</span><span class="insert">5.7.4.4</span> </span>prov:type</a></li><li class="tocline"><a href="#term-attribute-value" class="tocxref"><span class="secno"><span class="delete">4.7.4.5</span><span class="insert">5.7.4.5</span> </span>prov:value</a></li><li class="tocline"><a href="#term-attribute-provenance-uri" class="tocxref"><span class="secno"><span class="insert">5.7.4.6 </span></span><span class="insert">prov:provenance-uri</span></a></li><li class="tocline"><a href="#term-attribute-service-uri" class="tocxref"><span class="secno"><span class="insert">5.7.4.7 </span></span><span class="insert">prov:service-uri</span></a></li></ul></li><li class="tocline"><a href="#term-value" class="tocxref"><span class="secno"><span class="delete">4.7.5</span><span class="insert">5.7.5</span> </span>Value</a></li></ul></li></ul></li><li class="tocline"><a href="#extensibility-section" class="tocxref"><span class="secno"><span class="delete">5.</span><span class="insert">6.</span> </span>PROV-DM Extensibility Points</a></li><li class="tocline"><a href="#valid-provenance" class="tocxref"><span class="secno"><span class="delete">6.</span><span class="insert">7.</span> </span>Creating Valid Provenance</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> 
 
 
 
@@ -1021,33 +1057,50 @@
 
 <p>
 We
-consider a core data model for provenance that allows  domain and application specific representations of provenance to be translated into such a data model and  <em>interchanged</em> between systems.
-Thus, heterogeneous systems can export their native provenance into such a core data model, and applications that need to make sense of provenance in heterogeneous systems can then import it,
+consider a <span class="delete">core</span><span class="insert">generic</span> data model for provenance that allows  domain and application specific representations of provenance to be translated into such a data model and  <em>interchanged</em> between systems.
+Thus, heterogeneous systems can export their native provenance into such a core data model, and applications that need to make sense of provenance <span class="delete">in heterogeneous systems </span>can then import it,
 process it, and reason over it.</p>
 
-<p>A set of specifications, referred to as the PROV family of specifications, define the various aspects
+
+
+
+
+
+<p><span class="delete">A set of specifications, referred</span><span class="insert">
+The PROV data model distinguishes </span><em><span class="insert">core structures</span></em><span class="insert"> from
+</span><em><span class="insert">extended structures</span></em><span class="insert">: core structures form the essence of
+provenance descriptions, and are commonly found in various
+domain-specific vocabularies. Extended structures enhance and refine core
+structures with more expressive capabilities</span> to <span class="delete">as the PROV family of specifications, define the various aspects
 that are necessary to achieve this vision in an interoperable
-way:</p>
-<ul>
-<li>A data model for provenance, which is presented in three documents:
-<ul>
-<li> PROV-DM (part I): the provenance data model, informally described (this document);
-</li><li> PROV-CONSTRAINTS (part II): constraints underpinning the data model [<cite><a class="bibref" rel="biblioentry" href="#bib-PROV-CONSTRAINTS">PROV-CONSTRAINTS</a></cite>];
-</li><li> PROV-N (part III): a notation to express instances of that data model for human consumption [<cite><a class="bibref" rel="biblioentry" href="#bib-PROV-N">PROV-N</a></cite>];
-</li></ul> 
-</li>
-<li>PROV-O: the PROV ontology, an OWL-RL ontology allowing the mapping of PROV to RDF [<cite><a class="bibref" rel="biblioentry" href="#bib-PROV-O">PROV-O</a></cite>];</li>
-<li>PROV-AQ: the mechanisms for accessing and querying provenance [<cite><a class="bibref" rel="biblioentry" href="#bib-PROV-AQ">PROV-AQ</a></cite>];</li>
-<li>PROV-PRIMER: a primer for the PROV approach [<cite><a class="bibref" rel="biblioentry" href="#bib-PROV-PRIMER">PROV-PRIMER</a></cite>];</li>
-<li>PROV-SEM: semantics of the PROV-DM data model [<cite><a class="bibref" rel="biblioentry" href="#bib-PROV-SEM">PROV-SEM</a></cite>];</li>
-<li>PROV-XML: an XML schema for the PROV data model.</li>
-</ul>
-
-
-<p>
-The  PROV data model is a domain-agnostic model, but with clear extensibility points allowing further domain-specific and
+way:</span>
+
+<span class="delete">A data model</span><span class="insert">cater</span> for <span class="delete">provenance, which is presented in three documents:
+</span>
+<span class="delete"> PROV-DM (part I): the provenance data model, informally described (this document);
+</span><span class="delete"> PROV-CONSTRAINTS (part II): constraints underpinning the data model [</span><span class="delete">PROV-CONSTRAINTS</span><span class="delete">];
+</span><span class="delete"> PROV-N (part III): a notation to express instances of that data model for human consumption [</span><span class="delete">PROV-N</span><span class="delete">];
+</span> 
+
+<span class="delete">PROV-O: the PROV ontology, an OWL-RL ontology allowing the mapping of PROV to RDF [</span><span class="delete">PROV-O</span><span class="delete">];</span>
+<span class="delete">PROV-AQ: the mechanisms for accessing and querying provenance [</span><span class="delete">PROV-AQ</span><span class="delete">];</span>
+<span class="delete">PROV-PRIMER: a primer for the PROV approach [</span><span class="delete">PROV-PRIMER</span><span class="delete">];</span>
+<span class="delete">PROV-SEM: semantics of the PROV-DM data model [</span><span class="delete">PROV-SEM</span><span class="delete">];</span>
+<span class="delete">PROV-XML: an XML schema for the PROV data model.</span>
+
+
+
+<span class="insert">more
+advanced uses of provenance.</span>
+The  PROV data <span class="insert">model, comprising both core and extended structures, is a domain-agnostic model, but with clear extensibility points allowing further domain-specific and
 application-specific extensions to be defined.
-The PROV data model is structured according to six components covering various aspects of provenance:</p>
+</span></p>
+
+
+<p><span class="insert">
+The PROV data </span>model <span class="insert">has a modular design and </span>is <span class="delete">a domain-agnostic model, but with clear extensibility points allowing further domain-specific and
+application-specific extensions</span><span class="insert">structured according</span> to <span class="delete">be defined.
+The PROV data model is structured according to </span>six components covering various <span class="delete">aspects</span><span class="insert">facets</span> of provenance:</p>
 <ul>
 <li> component 1: entities and activities, and the time at which they were created, used, or ended;
 </li><li> component 2: agents bearing responsibility for entities that were generated and activities that happened;
@@ -1058,19 +1111,19 @@
 </li></ul>
 
 
-<p>This specification presents the key concepts of the PROV Data Model, and
+<p>This specification presents the <span class="delete">key </span>concepts of the PROV Data Model, and
 provenance types and relations, without specific concern for how they are applied.
 With these, it becomes possible to write useful provenance descriptions, and publish or embed them <span class="delete">along side</span><span class="insert">alongside</span> the data they relate to. </p>
 
 <p>However, if something about which provenance is expressed is subject to change, then it is challenging to express its provenance precisely (e.g. the data from which a daily weather report is derived  changes from day to day).
- To address this challenge, a <em>refinement</em> is proposed to enrich simple provenance, with extra descriptions that  help qualify the specific subject of provenance and provenance itself, with attributes and temporal information, intended to satisfy a comprehensive set of constraints.  These aspects are covered in the companion specification [<cite><a class="bibref" rel="biblioentry" href="#bib-PROV-CONSTRAINTS">PROV-CONSTRAINTS</a></cite>].
+ To address this challenge, <span class="delete">a </span><span class="delete">refinement</span><span class="insert">it</span> is proposed to enrich simple provenance, with <span class="delete">extra</span><span class="insert">refined</span> descriptions that  help qualify the specific subject of provenance and provenance itself, with attributes and temporal information, intended to satisfy a comprehensive set of constraints.  These aspects are covered in the companion specification [<cite><a class="bibref" rel="biblioentry" href="#bib-PROV-CONSTRAINTS">PROV-CONSTRAINTS</a></cite>].
 </p>
 
 
 <div id="structure-of-this-document" class="section"> 
 <h3><span class="secno">1.1 </span>Structure of this Document</h3>
 
-<p><a href="#section-prov-overview">Section 2</a> provides<span class="insert"> an overview of the PROV Data Model,</span>  <span class="delete">starting points for the PROV Data Model, listing a</span><span class="insert">distinguishing a CORE</span> set of types and  relations, <span class="delete">which allows users to make initial</span><span class="insert">commonly found in</span> provenance <span class="delete">descriptions.</span><span class="insert">descriptions, from extended structures catering for advanced uses.</span></p>
+<p><a href="#section-prov-overview">Section 2</a> provides<span class="insert"> an overview of the PROV Data Model,</span>  <span class="delete">starting points for the PROV Data Model, listing a</span><span class="insert">distinguishing a core</span> set of types and  relations, <span class="delete">which allows users to make initial</span><span class="insert">commonly found in</span> provenance <span class="delete">descriptions.</span><span class="insert">descriptions, from extended structures catering for advanced uses. It also introduces a modular organization of the data model in components. </span></p>
 
 <p><a href="#prov-notation"><span class="insert">Section 3</span></a><span class="insert"> overviews the Provenance Notation used to illustrate examples of provenance descriptions.</span></p>
 
@@ -1089,7 +1142,7 @@
 
 <p><a href="#extensibility-section">Section <span class="delete">5</span><span class="insert">6</span></a> summarizes PROV-DM extensibility points.</p>
 
-<p><a href="#valid-provenance">Section <span class="delete">6</span><span class="insert">7</span></a> introduces the idea that constraints can be applied to the PROV data model to refine provenance descriptions; these are covered in the companion specification [<cite><a class="bibref" rel="biblioentry" href="#bib-PROV-CONSTRAINTS">PROV-CONSTRAINTS</a></cite>].</p>
+<p><a href="#valid-provenance">Section <span class="delete">6</span><span class="insert">7</span></a> introduces the idea that constraints can be applied to the PROV data model to <span class="delete">refine</span><span class="insert">validate</span> provenance descriptions; these are covered in the companion specification [<cite><a class="bibref" rel="biblioentry" href="#bib-PROV-CONSTRAINTS">PROV-CONSTRAINTS</a></cite>].</p>
 
 
 </div> 
@@ -1110,10 +1163,10 @@
 The following namespaces prefixes are used throughout this document.
 
 </p><div style="text-align: left;">
-<table border="1" style="margin-left: auto; margin-right: auto;">
+<table class="thinborder" style="margin-left: auto; margin-right: auto;">
 <caption id="namespace-table">Table 1: Prefix and Namespaces used in this specification</caption>
 <tbody><tr><td><a><b>prefix</b></a></td><td><b>namespace uri</b></td> <td><b>definition</b></td></tr>
-<tr><td><a>prov</a></td><td>http://www.w3.org/ns/prov#</td><td>The PROV namespace (see Section <a href="#term-NamespaceDeclaration">4.7.1</a>)</td></tr>
+<tr><td><a>prov</a></td><td>http://www.w3.org/ns/prov#</td><td>The PROV namespace (see Section <a href="#term-NamespaceDeclaration"><span class="delete">4.7.1</span><span class="insert">5.7.1</span></a>)</td></tr>
 <tr><td><a>xsd</a></td><td>http://www.w3.org/2000/10/XMLSchema#</td><td>XML Schema Namespace [<cite><a class="bibref" rel="biblioentry" href="#bib-XMLSCHEMA-2">XMLSCHEMA-2</a></cite>]</td></tr>
 <tr><td><a>rdf</a></td><td>http://www.w3.org/1999/02/22-rdf-syntax-ns#</td><td>The RDF namespace  [<cite><a class="bibref" rel="biblioentry" href="#bib-RDF-CONCEPTS">RDF-CONCEPTS</a></cite>]</td></tr>
 <tr><td><a>(others)</a></td><td>(various)</td><td>All other namespace prefixes are used in examples only. <br> In particular, URIs starting with "http://example.com" represent<br> some application-dependent URI [<cite><a class="bibref" rel="biblioentry" href="#bib-URI">URI</a></cite>]</td></tr>
@@ -1122,7 +1175,7 @@
 
 <p><span class="insert"> 
   Examples throughout this document use the PROV-N Provenance
-  Notation, briefly introduced in </span><a href="#prov-notation"><span class="insert">Section 3</span></a><span class="insert"> and specified fully in separate document [</span><cite><a class="bibref" rel="biblioentry" href="#bib-PROV-N"><span class="insert">PROV-N</span></a></cite><span class="insert">].</span></p>
+  Notation, briefly introduced in </span><a href="#prov-notation"><span class="insert">Section 3</span></a><span class="insert"> and specified fully in a separate document [</span><cite><a class="bibref" rel="biblioentry" href="#bib-PROV-N"><span class="insert">PROV-N</span></a></cite><span class="insert">].</span></p>
 
 
 </div> 
@@ -1136,7 +1189,7 @@
 
 <p>
 This section introduces provenance concepts with informal descriptions and illustrative
-examples.<span class="insert"> PROV distinguishes</span>  <span class="delete">Since </span><em><span class="insert">core structures</span></em><span class="insert">, forming the essence of  provenance descriptions, from </span><em><span class="insert">extended structures</span></em><span class="insert"> catering for more advanced uses of provenance.  Core and extended structures are respectively presented in </span><a href="#core-structures"><span class="insert">Section 2.1</span></a><span class="insert"> and </span><a href="#section-extended-structures"><span class="insert">Section 2.2</span></a><span class="insert">. Furthermore, the PROV data model is organized according to components, which are thematic groupings of concepts, overviewed in </span><a href="#section-overview-components"><span class="insert">Section 2.3</span></a><span class="insert">.
+examples.<span class="insert"> PROV distinguishes</span>  <span class="delete">Since </span><em><span class="insert">core structures</span></em><span class="insert">, forming the essence of  provenance descriptions, from </span><em><span class="insert">extended structures</span></em><span class="insert"> catering for more advanced uses of provenance.  Core and extended structures are respectively presented in </span><a href="#core-structures"><span class="insert">Section 2.1</span></a><span class="insert"> and </span><a href="#section-extended-structures"><span class="insert">Section 2.2</span></a><span class="insert">. Furthermore, the PROV data model is organized according to components, which form thematic groupings of concepts (see </span><a href="#section-overview-components"><span class="insert">Section 2.3</span></a><span class="insert">).
 </span></p>
 
 
@@ -1146,7 +1199,7 @@
 <p><span class="insert">The core of PROV consists of essential provenance structures commonly found in provenance descriptions.
 It is summarized graphically by
 the UML diagram of </span><a href="#prov-core-structures"><span class="insert">Figure 1</span></a><span class="insert">,
-illustrating  three types (entity, activity, and agent) and how they relate to each other.  In the core of PROV, all relations are binary. </span></p>
+illustrating  three types (entity, activity, and agent) and how they relate to each other.  In the core of PROV, all associations are binary. </span></p>
 
 
 <div style="text-align: center; ">
@@ -1157,9 +1210,9 @@
   </figure>
 </div>
 
-<p><span class="insert">The rest of this section introduces the concepts found in PROV Core structures.
-They are summarized in  </span><a href="#overview-types-and-relations"><span class="insert">Table 2</span></a><span class="insert">, where they are grouped according to
-the types and relations the PROV conceptual data model. 
+<p><span class="insert">The concepts found in the core of PROV are introduced in the rest of this section.
+They are summarized in  </span><a href="#overview-types-and-relations"><span class="insert">Table 2</span></a><span class="insert">, where they are categorized as
+ type or relation.
  The first column lists concepts, the second column indicates whether a concept maps to a type or a relation, whereas the third column contains the corresponding name.    Names of relations have a verbal form in the past tense to express what happened in the past, as opposed to what may or will happen. 
 </span></p>
 
@@ -1167,8 +1220,9 @@
 
 
 
+
 <div style="text-align: left;">
-<table border="1" style="margin-left: auto; margin-right: auto;">
+<table class="thinborder" style="margin-left: auto; margin-right: auto;">
 <caption id="overview-types-and-relations"><span class="insert">Table 2: Mapping of PROV core concepts to  types and relations</span></caption>
 <tbody><tr><td><a><b><span class="insert">PROV Concepts</span></b></a></td><td><b>PROV-DM <span class="delete">is a conceptual data
 model, Section 2.5 maps the concepts to various </span>types <span class="delete">and relations,
@@ -1182,13 +1236,14 @@
 
 <span class="insert">Types</span></td><td><a title="dfn-Entity" href="#dfn-entity" class="internalDFN"><span class="insert">entity</span></a></td><td style="text-align: center;"><a href="#section-entity-activity"><span class="insert">2.1.1</span></a></td></tr>
 <tr><td><a href="#concept-activity" class="internalDFN"><span class="insert">Activity</span></a></td><td><a title="dfn-Activity" href="#dfn-activity" class="internalDFN"><span class="insert">activity</span></a></td><td style="text-align: center;"><a href="#section-entity-activity"><span class="insert">2.1.1</span></a></td></tr>
-<tr><td><a href="#concept-agent" class="internalDFN"><span class="insert">Agent</span></a></td><td><a title="dfn-agent" href="#dfn-agent" class="internalDFN"><span class="insert">agent</span></a></td><td style="text-align: center;"><a href="#section-agents-attribution-association-responsibility"><span class="insert">2.1.2</span></a></td></tr>
+<tr><td><a href="#concept-agent" class="internalDFN"><span class="insert">Agent</span></a></td><td><a title="dfn-agent" href="#dfn-agent" class="internalDFN"><span class="insert">agent</span></a></td><td style="text-align: center;"><a href="#section-agents-attribution-association-delegation"><span class="insert">2.1.2</span></a></td></tr>
 <tr>
-<td><a href="#concept-generation" class="internalDFN"><span class="insert">Generation</span></a></td><td rowspan="6" style="text-align: center;"><span class="insert">PROV-DM Relations</span></td><td><a title="wasGeneratedBy" href="#dfn-wasgeneratedby" class="internalDFN"><span class="insert">wasGeneratedBy</span></a></td><td style="text-align: center;"><a href="#section-entity-activity"><span class="insert">2.1.1</span></a></td></tr>
+<td><a href="#concept-generation" class="internalDFN"><span class="insert">Generation</span></a></td><td rowspan="7" style="text-align: center;"><span class="insert">PROV-DM Relations</span></td><td><a title="wasGeneratedBy" href="#dfn-wasgeneratedby" class="internalDFN"><span class="insert">wasGeneratedBy</span></a></td><td style="text-align: center;"><a href="#section-entity-activity"><span class="insert">2.1.1</span></a></td></tr>
 <tr><td><a href="#concept-usage" class="internalDFN"><span class="insert">Usage</span></a></td><td><a title="used" href="#dfn-used" class="internalDFN"><span class="insert">used</span></a></td><td style="text-align: center;"><a href="#section-entity-activity"><span class="insert">2.1.1</span></a></td></tr>
-<tr><td><a href="#concept-attribution" class="internalDFN"><span class="insert">Attribution</span></a></td><td><a title="wasAttributedTo" href="#dfn-wasattributedto" class="internalDFN"><span class="insert">wasAttributedTo</span></a></td><td style="text-align: center;"><a href="#section-agents-attribution-association-responsibility"><span class="insert">2.1.2</span></a></td></tr>
-<tr><td><a href="#concept-association-core" class="internalDFN"><span class="insert">Association</span></a></td><td><a title="wasAssociatedWith" href="#dfn-wasassociatedwith" class="internalDFN"><span class="insert">wasAssociatedWith</span></a></td><td style="text-align: center;"><a href="#section-agents-attribution-association-responsibility"><span class="insert">2.1.2</span></a></td></tr>
-<tr><td><a href="#concept-responsibility" class="internalDFN"><span class="insert">Responsibility</span></a></td><td><a title="actedOnBehalfOf" href="#dfn-actedonbehalfof" class="internalDFN"><span class="insert">actedOnBehalfOf</span></a></td><td style="text-align: center;"><a href="#section-agents-attribution-association-responsibility"><span class="insert">2.1.2</span></a></td></tr>
+<tr><td><a href="#concept-communication" class="internalDFN"><span class="insert">Communication</span></a></td><td><a title="wasInformedBy" href="#dfn-wasinformedby" class="internalDFN"><span class="insert">wasInformedBy</span></a></td><td style="text-align: center;"><a href="#section-entity-activity"><span class="insert">2.1.1</span></a></td></tr>
+<tr><td><a href="#concept-attribution" class="internalDFN"><span class="insert">Attribution</span></a></td><td><a title="wasAttributedTo" href="#dfn-wasattributedto" class="internalDFN"><span class="insert">wasAttributedTo</span></a></td><td style="text-align: center;"><a href="#section-agents-attribution-association-delegation"><span class="insert">2.1.2</span></a></td></tr>
+<tr><td><a href="#concept-association-core" class="internalDFN"><span class="insert">Association</span></a></td><td><a title="wasAssociatedWith" href="#dfn-wasassociatedwith" class="internalDFN"><span class="insert">wasAssociatedWith</span></a></td><td style="text-align: center;"><a href="#section-agents-attribution-association-delegation"><span class="insert">2.1.2</span></a></td></tr>
+<tr><td><a href="#concept-responsibility" class="internalDFN"><span class="insert">Responsibility</span></a></td><td><a title="actedOnBehalfOf" href="#dfn-actedonbehalfof" class="internalDFN"><span class="insert">actedOnBehalfOf</span></a></td><td style="text-align: center;"><a href="#section-agents-attribution-association-delegation"><span class="insert">2.1.2</span></a></td></tr>
 <tr><td><a href="#concept-derivation" class="internalDFN"><span class="insert">Derivation</span></a></td><td><a title="wasDerivedFrom" href="#dfn-wasderivedfrom" class="internalDFN"><span class="insert">wasDerivedFrom</span></a></td><td style="text-align: center;"><a href="#section-derivation"><span class="insert">2.1.3</span></a></td></tr>
 </tbody></table>
 </div>
@@ -1248,7 +1303,7 @@
 <span class="delete">2.2 </span><span class="delete">Generation, Usage, Derivation</span>
 
 <p>Activities and entities are associated with each other in two different ways: activities utilize entities and activities  produce entities. The act of utilizing or producing an entity may have a duration.  
- The term 'generation' refers to the completion of the act of producing; likewise, the term 'usage' refers to the beginning of the act of utilizing entities. Thus, we define the following notions of generation and usage. </p>
+ The term 'generation' refers to the completion of the act of producing; likewise, the term 'usage' refers to the beginning of the act of utilizing entities. Thus, we define the following <span class="delete">notions</span><span class="insert">concepts</span> of generation and usage. </p>
 
 <p>
 </p><div class="glossary-ref">
@@ -1276,11 +1331,23 @@
 the mix); in contrast, the same entity may be used multiple times, possibly by different activities (e.g. a file on a file system can be read indefinitely).
 </p></div>
 
+<p>
+</p><div class="glossary-ref">
+   <span class="dfn"><span class="insert">Communication</span></span><span class="insert"> is the exchange of an entity by two activities, one activity using the entity generated by the other. </span></div>
+
+
+
+
+<div class="conceptexample" id="communication-example">
+<p><span class="insert">An example of commication is ...
+</span></p></div>
+
+
 
 </div>
 
 
-<div id="section-agents-attribution-association-responsibility" class="section"> 
+<div id="section-agents-attribution-association-delegation" class="section"> 
 <h4><span class="secno"><span class="insert">2.1.2 </span></span><span class="insert">Agents and Responsibility</span></h4>
 
 <p><span class="delete">Activities utilize</span><span class="insert">The motivation for introducing  agents in the model is to express the agent's responsibility for activities that happened and</span> entities <span class="delete">and producer entities. In some cases, utilizing an entity influences the creation of another in some way. This notion is captured by derivations, defined as follows.</span><span class="insert">that were generated. </span></p>
@@ -1315,7 +1382,7 @@
 
 <div class="conceptexample" id="agent-example">
 <p>
-Software for checking the use of grammar in a document may be defined as an agent of a document preparation activity, and at the same time one can describe its provenance, including for instance the vendor and the version history. 
+Software for checking the use of grammar in a document may be defined as an agent of a document preparation <span class="delete">activity, and at the same time </span><span class="insert">activity;  </span>one can<span class="insert"> also</span> describe its provenance, including for instance the vendor and the version history. 
 A site selling books on the Web, the services involved in the processing of orders, and the companies hosting them are also agents.
 </p>
 </div>
@@ -1376,29 +1443,26 @@
 </p><ul>
 <li>creation of a web page under the guidance of a designer;</li>
 <li>various forms of participation in a panel discussion, including audience member, panelist, or panel chair;</li>
-<li>a public event, sponsored by a company, and hosted by a museum;
-<span class="delete">an XSLT transform launched by a user based on an XSL style sheet (a plan).</span></li>
+<li>a public event, sponsored by a company, and hosted by a museum;</li>
 </ul>
 </div>
 
+
+
 <p>
 <span class="glossary-ref">
-    <span class="dfn">Responsibility</span> is the fact that an agent is accountable for the actions of a "subordinate" agent, in the context of an activity.  </span> The nature of this relation is intended to be broad,  including delegation or contractual relation. </p>
-
-
-  
+   <span class="dfn"><span class="insert">Delegation</span></span><span class="insert"> is the assignment of authority to </span>an <span class="insert">agent (by itself or by another agent)  to carry out a specific activity as a delegate or representative, while the agent that it represents remains responsible for the outcome of the delegated work. </span></span><span class="insert"> The nature of this relation is intended to be broad,  including contractual relation, but also altruistic initiative by the representative agent. </span></p>
 
 
 
 
 <div class="conceptexample" id="responsibility-example">
-<p>A student publishing a web page describing an academic
+<p><span class="insert">A student publishing a web page describing an academic
 department could result in both the student and the department being
-agents associated with the <span class="delete">activity, and</span><span class="insert">activity.  It may not matter which actual
-student published a web page, but</span> it may <span class="delete">not </span>matter <span class="delete">which
-student published a web page but it matters a lot</span><span class="insert">significantly</span> that the department
+agents associated with the activity.  It may not matter which actual
+student published a web page, but it may matter significantly that the department
 told the student to put up the web page.  
-</p>
+</span></p>
 </div>
 </div>
 
@@ -1407,10 +1471,10 @@
 
 
 
-<p><span class="insert">Activities utilize entities and produce entities. In some cases, utilizing an entity influences the creation of another in some way. This notion is captured by derivations, defined as follows.</span></p>
+<p><span class="insert">Activities utilize entities and produce entities. In some cases, utilizing an entity influences the creation of another in some way. This notion of 'influence' is captured by derivations, defined as follows.</span></p>
 
 <p>
-<span class="glossary-ref"><span class="insert">   A </span><span class="dfn"><span class="insert">derivation</span></span><span class="insert">  is a transformation of an entity into another, a construction of an entity into another, or an update of an entity, resulting in a new one.</span></span>
+<span class="glossary-ref"><span class="insert">   A </span><span class="dfn"><span class="insert">derivation</span></span><span class="insert">  is a transformation of an entity into another, an update of an entity, resulting in a new one, or based on an entity, the construction of another.</span></span>
 
 
 
@@ -1424,11 +1488,11 @@
 </div>
 
 <div id="section-extended-structures" class="section"> 
-<h3><span class="secno"><span class="delete">2.4 </span><span class="delete">Further Entities: Collections and Accounts</span><span class="insert">2.2 </span></span><span class="insert">PROV Extended Structures</span></h3>
-
-<p><span class="delete">There </span><span class="insert">While the core of PROV focuses on essential provenance structures commonly found in provenance descriptions, extended structures 
-</span>are <span class="insert">designed to support more advanced uses of provenance. 
-The purpose of this section is twofold. First, mechanisms to specify these extended structures are introduced.  Second,  </span>two further <span class="delete">types of entities, collections</span><span class="insert">categories of provenance structures are overviewed: they cater for provenance of provenance</span> and <span class="delete">accounts, which</span><span class="insert">collections,  respectively.</span></p>
+<h3><span class="secno"><span class="insert">2.2 </span></span><span class="insert">PROV Extended Structures</span></h3>
+
+<p><span class="insert">While the core of PROV focuses on essential provenance structures commonly found in provenance descriptions, extended structures 
+are designed to support more advanced uses of provenance. 
+The purpose of this section is twofold. First, mechanisms to specify these extended structures are introduced.  Second,  two further kinds of provenance structures are overviewed: they cater for provenance of provenance and collections,  respectively.</span></p>
 
 
 
@@ -1436,7 +1500,7 @@
 <div id="section-prov-extended-mechanisms" class="section"> 
 <h4><span class="secno"><span class="insert">2.2.1 </span></span><span class="insert">Mechanisms to Define Extended Structures</span></h4>
 
-<p><span class="insert">Extended structures</span> are <span class="delete">now introduced.</span><span class="insert">defined by a variety of mechanisms 
+<p><span class="insert">Extended structures are defined by a variety of mechanisms 
 outlined in this section: subtyping, expanded relations, optional
 identification, and new relations.</span></p>
 
@@ -1460,18 +1524,18 @@
 <div id="section-prov-extended-approach-expanded-relation" class="section"> 
 <h5><span class="secno"><span class="insert">2.2.1.2 </span></span><span class="insert">Expanded Relations</span></h5>
 
-<p><a href="#core-structures"><span class="insert">Section 2.1</span></a><span class="insert"> shows that six concepts are mapped to binary relations in the core of PROV.  However, some advanced uses of these concepts cannot be captured by a binary relation, but require relations to be expanded to n-ary relations.</span></p>
+<p><a href="#core-structures"><span class="insert">Section 2.1</span></a><span class="insert"> shows that seven concepts are mapped to binary relations in the core of PROV.  However, some advanced uses of these concepts cannot be captured by a binary relation, but require relations to be expanded to n-ary relations.</span></p>
 
 
 <p><span class="insert">To illustrate expanded relations, we consider the concept of
 association, described
-in </span><a href="#section-agents-attribution-association-responsibility"><span class="insert">section
+in </span><a href="#section-agents-attribution-association-delegation"><span class="insert">section
 2.1.2</span></a><span class="insert">.  Agents may adopt sets of actions or steps to achieve their
 goals in the context of an activity: this is captured by the notion of
 a plan.  Thus, an activity may reflect the execution of a plan that was
 designed in advance to guide the execution.  Hence, an expanded
 association relation allows a plan be linked to an
-activity. Plan is defined by subtyping and full association by an expanded relation, as follows.</span> </p>
+activity. Plan is defined by subtyping and full association by an expanded relation, as follows. </span></p>
 
 <p>
 <span class="glossary-ref"><span class="insert">
@@ -1492,9 +1556,11 @@
 
 <div class="conceptexample" id="association-example2">
 <p><span class="insert">An example of association between an activity and an agent involving a plan is:
-an XSLT transform launched by a user based on an XSL style sheet (a plan).
-
-</span></p></div>
+an </span>XSLT transform <span class="insert">(an activity) </span>launched by a user <span class="insert">(an agent) </span>based on an XSL style sheet (a plan).
+
+
+
+</p></div>
 </div>
 
 
@@ -1504,10 +1570,9 @@
 <p><span class="insert">Some concepts exhibit both a core use, expressed as
 binary relation, and an extended use, expressed as n-ary relation.  In
 some cases, mapping the concept to a relation, whether binary or
-n-ary, is not sufficient: instead, it may be required to able to
-identify an instance of such concept.</span></p>
-
-<p><span class="insert">In such circumstances, PROV-DM allows an optional identifier to be
+n-ary, is not sufficient: instead, it may be required to
+identify an instance of such concept.  In those cases, PROV-DM allows for 
+an optional identifier to be
 expressed to identify an instance of an association between two or
 more elements.  This optional identifier can then be used to refer to
 an instance as part of other concepts.</span></p>
@@ -1536,24 +1601,41 @@
 
 
 <p>
-<span class="glossary-ref"><span class="insert">
- A </span><span class="dfn"><span class="insert">bundle</span></span><span class="insert"> is a named set of provenance descriptions, and is itself an entity, so allowing provenance of provenance to be expressed.  </span></span>
+<span class="glossary-ref">
+    <span class="insert">
+ A </span><span class="dfn"><span class="delete">Responsibility</span><span class="insert">bundle</span></span> is <span class="delete">the fact that</span><span class="insert">a named set of provenance descriptions, and is itself</span> an <span class="delete">agent</span><span class="insert">entity, so allowing provenance of provenance to be expressed.  </span></span>
 
 </p><div class="conceptexample" id="bundle-example">
 <p><span class="insert">
 For users to decide whether they can place their trust in
 a resource, they may want to analyze the resource's provenance, but also determine
-who its provenance is attributed to, and when it was
+who its provenance</span> is <span class="delete">accountable for the actions of a "subordinate" agent, in the context of</span><span class="insert">attributed to, and when it was
 generated. In other words, users need to be able to determine the provenance of provenance.
 Hence, provenance is also
-regarded as an entity (of type Bundle), by which provenance of provenance can then be
+regarded as</span> an <span class="delete">activity.  </span><span class="delete"> The nature of this relation is intended to</span><span class="insert">entity (of type Bundle), by which provenance of provenance can then</span> be<span class="delete"> broad,  including delegation or contractual relation. </span>
+
+
+  
+
+
+
+
+
+<span class="delete">A student publishing a web page describing an academic
+department could result in both the student and the department being
+agents associated with the activity, and it may not matter which
+student published a web page but it matters a lot that the department
+told the student to put up the web page.  
+</span><span class="insert">
 expressed.
 </span></p>
 </div>
 </div>
 
 <div id="section-collections" class="section"> 
-<h4><span class="secno"><span class="insert">2.2.3 </span></span><span class="insert">Collections</span></h4>
+<h4><span class="secno"><span class="delete">2.4 </span><span class="delete">Further Entities: </span><span class="insert">2.2.3 </span></span>Collections<span class="delete"> and Accounts</span>
+
+<span class="delete">There are two further types of entities, collections and accounts, which are now introduced. </span></h4>
 
 <p>
 <span class="glossary-ref">   A <span class="dfn">collection</span> is an entity that provides a structure to some constituents, which are themselves entities. These constituents are said to be <span class="dfn">member of</span> the collections.  </span> This concept allows for the provenance of the collection itself to be expressed in addition to that of the members.  Many different types of collections exist, such as a <em><span class="delete">set</span><span class="insert">sets</span></em>, <em>dictionaries</em>, or <em>lists</em>, all of which involve a membership relationship between the constituents and the collection. </p>
@@ -1602,10 +1684,10 @@
 is further organized according to components, grouping concepts in a
 thematic manner. </span></p>
 
-<p> <a href="#components-overview"><span class="insert">Table 3</span></a><span class="insert"> enumerates the six components, five of which</span> have <span class="delete">introduced a series of concepts underpinning provenance.   PROV-DM  is a conceptual data model consisting of types and relations between these.  </span><span class="insert">already been implicitly overviewed in this section. All components offer extended structures, whereas the first three only offer core structures.
+<p> <a href="#components-overview"><span class="insert">Table 3</span></a><span class="insert"> enumerates the six components, five of which</span> have <span class="delete">introduced a series of concepts underpinning provenance.   PROV-DM</span><span class="insert">already been implicitly overviewed in this section. All components specify extended structures, whereas only the first three</span>  <span class="delete">is a conceptual data model consisting of types and relations between these.  </span><span class="insert">define core structures.
 
 </span></p><div id="components-overview-div" style="text-align: center;">
-<table border="1" style="margin-left: auto; margin-right: auto;">
+<table class="thinborder" style="margin-left: auto; margin-right: auto;">
 <caption id="components-overview">Table <span class="delete">2</span><span class="delete"> shows how provenance concepts can be mapped to types and relations in PROV-DM: the first column lists concepts introduced in this section, the second column indicates whether a concept maps to a type or a relation, whereas the third column contains the corresponding name.    Names of relations have a verbal form in the past tense to express what happened in the past, as opposed to what may or will happen. 
 </span>
 
@@ -1613,12 +1695,13 @@
 
 
 <span class="delete">Table 2: Mapping of Provenance concepts to  types and relations</span><span class="insert">3: Components Overview</span></caption>
-<tbody><tr><td><span class="delete">PROV Concepts</span></td><td><span class="delete">PROV-DM types or relations</span><span class="insert">Component</span></td><td><span class="delete">Name</span><span class="insert">Core </span><br><span class="insert">Structures</span></td><td><span class="insert">Overview</span></td><td><span class="insert">Specification</span></td><td><span class="insert">Description</span></td></tr>
+<tbody><tr><span class="delete">PROV Concepts</span><td style="border-width: 0px; "></td><td><span class="delete">PROV-DM types or relations</span><span class="insert">Component</span></td><td><span class="delete">Name</span><span class="insert">Core </span><br><span class="insert">Structures</span></td><td><span class="insert">Overview</span></td><td><span class="insert">Specification</span></td><td><span class="insert">Description</span></td></tr>
  
 <tr>
-<td><span class="delete">Entity</span><span class="insert">1</span></td><span class="delete">PROV-DM Types</span><td style="text-align: left;"><span class="insert">Entities and Activities</span></td><td><span class="delete">entity</span><span class="insert">✔</span></td><td><a href="#section-entity-activity"><span class="insert">2.1.1</span></a></td><td><a href="#component1"><span class="insert">5.1</span></a></td><td style="text-align: left;"><span class="insert">about entities and activities, and their interrelations</span></td></tr>
+<span class="delete">Entity</span><td style="border-width: 0px; "></td><span class="delete">PROV-DM Types</span><td style="border-width: 0px; "></td><td style="border-width: 0px; "></td><td style="border-width: 0px; "></td><td style="border-width: 0px; "></td></tr>
+<tr><td style="	padding: 8px;"><span class="insert">1</span></td><td style="text-align: left;"><span class="insert">Entities and Activities</span></td><td><span class="delete">entity</span><span class="insert">✔</span></td><td><a href="#section-entity-activity"><span class="insert">2.1.1</span></a></td><td><a href="#component1"><span class="insert">5.1</span></a></td><td style="text-align: left;"><span class="insert">about entities and activities, and their interrelations</span></td></tr>
  
-<tr><td><span class="delete">Activity</span><span class="insert">2</span></td><td style="text-align: left;"><span class="insert">Agent and Responsibility</span></td><td><span class="delete">activity</span><span class="insert">✔</span></td><td><a href="#section-agents-attribution-association-responsibility"><span class="insert">2.1.2</span></a></td><td><a href="#component2"><span class="insert">5.2</span></a></td><td style="text-align: left;"><span class="insert">about agents and concepts ascribing responsibility to them</span></td></tr>
+<tr><td><span class="delete">Activity</span><span class="insert">2</span></td><td style="text-align: left;"><span class="insert">Agent and Responsibility</span></td><td><span class="delete">activity</span><span class="insert">✔</span></td><td><a href="#section-agents-attribution-association-delegation"><span class="insert">2.1.2</span></a></td><td><a href="#component2"><span class="insert">5.2</span></a></td><td style="text-align: left;"><span class="insert">about agents and concepts ascribing responsibility to them</span></td></tr>
  
 <tr><td><span class="delete">Agent</span><span class="insert">3</span></td><td style="text-align: left;"><span class="insert">Derivation</span></td><td><span class="delete">agent</span><span class="insert">✔</span></td><td><a href="#section-derivation"><span class="insert">2.1.3</span></a></td><td><a href="#component3"><span class="insert">5.3</span></a></td><td style="text-align: left;"><span class="insert">about derivations and its subtypes</span></td></tr>
  
@@ -1716,13 +1799,13 @@
 
 <li><span class="insert">
 PROV-N </span><em><span class="insert">optional arguments</span></em><span class="insert"> need not be specified:
-the general rule for optional arguments is that, if none of them are used in the expression, then they are simply omitted, resulting in a simpler expression. However, it may be the case that only some of the optional arguments need to be specified. Because the position of the arguments in the expression matters, in this case an additional marker must be used to indicate that a particular term is not available. The syntactic marker  '</span><span class="name"><span class="insert">-</span></span><span class="insert">' is used for this purpose.
+the general rule for optional arguments is that, if none of them are used in the expression, then they are simply omitted, resulting in a simpler expression. However, it may be the case that only some of the optional arguments need to be specified. Because the position of the arguments in the expression matters, in this case, an additional marker must be used to indicate that a particular term is not available. The syntactic marker  '</span><span class="name"><span class="insert">-</span></span><span class="insert">' is used for this purpose.
 </span></li>
 
 <li><span class="insert">Most expressions 
 include an identifier 
 and a set of attribute-value pairs; both are optional unless otherwise specified. By convention, the identifier occurs in the </span><em><span class="insert">first position</span></em><span class="insert">, and the set of attribute-value pairs in the </span><em><span class="insert">last position</span></em><span class="insert">.
-Consistent with the convention on arguments, the marker  </span><span class="name"><span class="insert">-</span></span><span class="insert"> can be used when the identifier is not available, or can be omitted altogether with no ambiguity arising.
+Consistent with the convention on arguments, the marker  '</span><span class="name"><span class="insert">-</span></span><span class="insert">' can be used when the identifier is not available, or can be omitted altogether with no ambiguity arising. To further disambiguate expressions that contains an optional identifier, the optional identifier or marker must be followed by '</span><span class="name"><span class="insert">;</span></span><span class="insert">'.
 </span></li>
 </ul>
 
@@ -1739,7 +1822,7 @@
 </span><pre class="codeexample"><span class="insert">used(a1,e1)
 wasGeneratedBy(e2,a1)
 </span></pre><span class="insert">
-The same description, but with an explicit identifier </span><span class="name"><span class="insert">u1</span></span><span class="insert"> for the usage, and the syntactic marker </span><span class="name"><span class="insert">-</span></span><span class="insert"> to mark the absence of identifier in the generation.
+The same descriptions, but with an explicit identifier </span><span class="name"><span class="insert">u1</span></span><span class="insert"> for the usage, and the syntactic marker '</span><span class="name"><span class="insert">-</span></span><span class="insert">' to mark the absence of identifier in the generation. Both are followed by  '</span><span class="name"><span class="insert">;</span></span><span class="insert">'.
 </span><pre class="codeexample"><span class="insert">used(u1;a1,e1)
 wasGeneratedBy(-;e2,a1)
 </span></pre>
@@ -1977,9 +2060,10 @@
 
 <h2><span class="secno"><span class="delete">4.</span><span class="insert">5.</span> </span>PROV-DM Types and Relations</h2>
 
-<p>Provenance concepts, expressed as PROV-DM types and relations, are structured according to six components that are introduced in this section.
-<span class="delete">Components</span><span class="insert">The components</span> and their dependencies are illustrated in <a href="#prov-dm-components">Figure 4</a>. A component that relies on concepts defined in another also sits above it in this figure.
-PROV-DM consists of the following components.</p>
+<p>Provenance concepts, expressed as PROV-DM types and relations, are <span class="delete">structured</span><span class="insert">organized</span> according to six components that are <span class="delete">introduced</span><span class="insert">defined</span> in this section.
+<span class="delete">Components</span><span class="insert">The components</span> and their dependencies are illustrated in <a href="#prov-dm-components">Figure 4</a>. A component that relies on concepts defined in another <span class="delete">also sits</span><span class="insert">is displayed</span> above it in <span class="delete">this</span><span class="insert">the</span> figure.<span class="delete">
+PROV-DM consists of the following components.</span><span class="insert">  So, for example, component 6 (collections) depends on concepts defined in component 3 (derivation), itself dependen on concepts defined in component 1 (entity and activity).
+</span></p>
 
 <div id="prov-dm-components-ul">
 <ul>
@@ -2027,7 +2111,7 @@
 </div>
 
 <p>
-While  not all PROV-DM relations are binary, they all involve two primary elements. Hence, <a href="#relations-at-a-glance">Table 3</a> indexes all relations according to their two primary elements.  The table adopts the same color scheme as <a href="#prov-dm-components">Figure 4</a>, allowing components to be readily identified.
+While  not all PROV-DM relations are binary, they all involve two primary elements. Hence, <a href="#relations-at-a-glance">Table <span class="delete">3</span><span class="insert">4</span></a> indexes all relations according to their two primary <span class="delete">elements.</span><span class="insert">elements (referred to as subject and object).</span>  The table adopts the same color scheme as <a href="#prov-dm-components">Figure 4</a>, allowing components to be readily identified.
 Note that for simplicity, this table  does not include <span class="insert">bundle-oriented and </span>collection-oriented relations.
 <span class="insert">Relation names appearing in bold correspond to the core structures introduced
 in </span><a href="#core-structures"><span class="insert">Section 2.1</span></a><span class="insert">.</span></p>
@@ -2036,56 +2120,70 @@
 
 
 <div id="relations-at-a-glance-div" style="text-align: center;">
-<table border="1" style="margin-left: auto; margin-right: auto;">
-<caption id="relations-at-a-glance">Table 3: PROV-DM Relations At a Glance</caption>
-<tbody><tr><td></td><td>Entity</td><td>Activity</td><td>Agent</td><span class="delete">Note</span></tr> 
-<tr><td>Entity</td><td><div class="component3-color"><a class="essential internalDFN" href="#dfn-wasderivedfrom">wasDerivedFrom</a><br><a>wasRevisionOf</a><br><a>wasQuotedFrom</a><br><a>hadOriginalSource</a></div><div class="component4-color"><a href="#dfn-alternateof" class="internalDFN">alternateOf</a><br><a href="#dfn-specializationof" class="internalDFN">specializationOf</a></div></td><td class="component1-color"><a class="essential internalDFN" title="wasGeneratedBy" href="#dfn-wasgeneratedby">wasGeneratedBy</a><br><a title="wasInvalidatedBy" href="#dfn-wasinvalidatedby" class="internalDFN">wasInvalidatedBy</a></td><td class="component2-color"><a class="essential internalDFN" href="#dfn-wasattributedto">wasAttributedTo<span class="delete">hasAnnotation</span></a></td></tr>
-<tr><td>Activity</td><td><div class="component1-color"><a class="essential internalDFN" href="#dfn-used">used</a><br><a href="#dfn-wasstartedby" class="internalDFN">wasStartedBy</a><br><a href="#dfn-wasendedby" class="internalDFN">wasEndedBy</a></div></td><td class="component1-color"><span class="delete">wasStartedByActivity</span><a href="#dfn-wasinformedby" class="internalDFN">wasInformedBy</a></td><td class="component2-color"><a class="essential internalDFN" href="#dfn-wasassociatedwith">wasAssociatedWith<span class="delete">hasAnnotation</span></a></td></tr>
+<table class="thinborder" style="margin-left: auto; margin-right: auto;">
+<caption id="relations-at-a-glance">Table <span class="delete">3:</span><span class="insert">4:</span> PROV-DM Relations At a Glance</caption>
+<tbody><tr><td style="border-width: 0px; "></td><td style="border-width: 0px; "></td><td colspan="3"><span class="insert">Object</span></td></tr> 
+<tr><td style="border-width: 0px; "></td><td style="border-width: 0px; "></td><td>Entity</td><td>Activity</td><td>Agent</td><span class="delete">Note</span></tr> 
+<tr><td rowspan="3"><span class="insert">Subject</span></td><td>Entity</td><td><div class="component3-color"><a class="essential internalDFN" href="#dfn-wasderivedfrom">wasDerivedFrom</a><br><a>wasRevisionOf</a><br><a>wasQuotedFrom</a><br><a>hadOriginalSource</a></div><div class="component4-color"><a href="#dfn-alternateof" class="internalDFN">alternateOf</a><br><a href="#dfn-specializationof" class="internalDFN">specializationOf</a></div></td><td class="component1-color"><a class="essential internalDFN" title="wasGeneratedBy" href="#dfn-wasgeneratedby">wasGeneratedBy</a><br><a title="wasInvalidatedBy" href="#dfn-wasinvalidatedby" class="internalDFN">wasInvalidatedBy</a></td><td class="component2-color"><a class="essential internalDFN" href="#dfn-wasattributedto">wasAttributedTo<span class="delete">hasAnnotation</span></a></td></tr>
+<tr><td>Activity</td><td><div class="component1-color"><a class="essential internalDFN" href="#dfn-used">used</a><br><a href="#dfn-wasstartedby" class="internalDFN">wasStartedBy</a><br><a href="#dfn-wasendedby" class="internalDFN">wasEndedBy</a></div></td><td class="component1-color"><span class="delete">wasStartedByActivity</span><a class="essential internalDFN" href="#dfn-wasinformedby">wasInformedBy</a></td><td class="component2-color"><a class="essential internalDFN" href="#dfn-wasassociatedwith">wasAssociatedWith<span class="delete">hasAnnotation</span></a></td></tr>
 <tr><td>Agent</td><td>—</td><td>—</td><td class="component2-color"><a class="essential internalDFN" href="#dfn-actedonbehalfof">actedOnBehalfOf<span class="delete">hasAnnotation</span>
 <span class="delete">Note</span><span class="delete">—</span><span class="delete">—</span><span class="delete">—</span><span class="delete">hasAnnotation</span></a></td></tr>
 </tbody></table>
 </div>
 
-<p><a href="#prov-dm-types-and-relations">Table 4</a> is a complete index of all the types and relations of PROV-DM, color-coded according to the component they belong to.  In the first column,  concept names  link to their informal definition, whereas, in the second column, representations link to the information used to represent the concept.<span class="insert"> Concept names appearing in bold are the core structures introduced in </span><a href="#core-structures"><span class="insert">Section 2.1</span></a><span class="insert">.</span></p>
+<p><a href="#prov-dm-types-and-relations">Table <span class="delete">4</span><span class="insert">5</span></a> is a complete index of all the types and relations of PROV-DM, color-coded according to the component they belong to.  In the first column,  concept names  link to their informal definition, whereas, in the second column, representations link to the information used to represent the concept.<span class="insert"> Concept names appearing in bold are the core structures introduced in </span><a href="#core-structures"><span class="insert">Section 2.1</span></a><span class="insert">.</span></p>
 
 
 <div id="prov-dm-types-and-relations-fig" style="text-align: left;">
-<table border="1" style="margin-left: auto; margin-right: auto;">
-<caption id="prov-dm-types-and-relations">Table 4: PROV-DM Types and Relations</caption>
+<table class="thinborder" style="margin-left: auto; margin-right: auto;">
+<caption id="prov-dm-types-and-relations">Table <span class="delete">4:</span><span class="insert">5:</span> PROV-DM Types and Relations</caption>
 <tbody><tr><td><a><b>Type or Relation Name</b></a></td><td><b>Representation in the PROV-N notation</b></td><td><b><span class="insert">Component</span></b></td></tr>
+<tr><td style="border-width: 0px; "></td><td style="border-width: 0px; "></td><td style="border-width: 0px; "></td></tr>
+
 <tr class="component1-color"><td class="essential"><a href="#concept-entity" class="internalDFN">Entity</a></td><td><a title="dfn-Entity" class="essential internalDFN" href="#dfn-entity">entity(id, [ attr1=val1, ...])</a></td><td rowspan="8"><a href="#component1"><span class="insert">Component 1: entities/activities</span></a></td></tr>
 <tr class="component1-color"><td class="essential"><a href="#concept-activity" class="internalDFN">Activity</a></td><td><a title="dfn-Activity" class="essential internalDFN" href="#dfn-activity">activity(id, st, et, [ attr1=val1, ...])</a></td></tr>
 <tr class="component1-color"><td class="essential"><a href="#concept-generation" class="internalDFN">Generation</a></td><td><a title="wasGeneratedBy" href="#dfn-wasgeneratedby" class="internalDFN"><span class="delete">wasGeneratedBy(id,e,a,t,attrs)</span><span class="essential"><span class="insert">wasGeneratedBy(</span></span><span class="insert">id;</span><span class="essential"><span class="insert">e,a</span></span><span class="insert">,t,attrs</span><span class="essential"><span class="insert">)</span></span></a></td></tr>
 <tr class="component1-color"><td class="essential"><a href="#concept-usage" class="internalDFN">Usage</a></td><td><a title="used" href="#dfn-used" class="internalDFN"><span class="delete">used(id,a,e,t,attrs)</span><span class="essential"><span class="insert">used(</span></span><span class="insert">id;</span><span class="essential"><span class="insert">a,e</span></span><span class="insert">,t,attrs</span><span class="essential"><span class="insert">)</span></span></a></td></tr>
+<tr class="component1-color"><td class="essential"><a href="#concept-communication" class="internalDFN"><span class="insert">Communication</span></a></td><td><a title="wasInformedBy" href="#dfn-wasinformedby" class="internalDFN"><span class="insert">wasInformedBy(id;a2,a1,attrs)</span></a></td></tr>
 <tr class="component1-color"><td><a href="#concept-start" class="internalDFN">Start</a></td><td><a title="wasStartedBy" href="#dfn-wasstartedby" class="internalDFN"><span class="delete">wasStartedBy(id,a,e,t,attrs)</span><span class="insert">wasStartedBy(id;a2,e,a1,t,attrs)</span></a></td></tr>
 <tr class="component1-color"><td><a href="#concept-end" class="internalDFN">End</a></td><td><a title="wasEndedBy" href="#dfn-wasendedby" class="internalDFN"><span class="delete">wasEndedBy(id,a,e,t,attrs)</span><span class="insert">wasEndedBy(id;a2,e,a1,t,attrs)</span></a></td></tr>
 <tr class="component1-color"><td><a href="#concept-invalidation" class="internalDFN">Invalidation</a></td><td><a title="wasInvalidatedBy" href="#dfn-wasinvalidatedby" class="internalDFN"><span class="delete">wasInvalidatedBy(id,e,a,t,attrs)</span><span class="insert">wasInvalidatedBy(id;e,a,t,attrs)</span></a></td></tr>
-<tr class="component1-color"><td><a href="#concept-communication" class="internalDFN">Communication</a></td><td><a title="wasInformedBy" href="#dfn-wasinformedby" class="internalDFN"><span class="delete">wasInformedBy(id,a2,a1,attrs)</span><span class="insert">wasInformedBy(id;a2,a1,attrs)</span></a></td></tr>
-<span class="delete">Start by Activity</span><tr class="component2-color"><td class="essential"><a href="#concept-agent" class="internalDFN"><span class="insert">Agent</span></a></td><td><span class="delete">wasStartedByActivity(id, a2, a1, attrs)</span><a title="dfn-agent" class="essential internalDFN" href="#dfn-agent"><span class="insert">agent(id, [ attr1=val1, ...])</span></a></td><td rowspan="8"><a href="#component2"><span class="insert">Component 2: agents/responsibility</span></a></td></tr>
+<span class="delete">Communication</span><tr><td style="border-width: 0px; "></td><td style="border-width: 0px; "></td><td style="border-width: 0px; "></td></tr>
+
+<tr class="component2-color" style="border-collapse: collapse; "><td class="essential"><a href="#concept-agent" class="internalDFN"><span class="insert">Agent</span></a></td><td><span class="delete">wasInformedBy(id,a2,a1,attrs)</span><a title="dfn-agent" class="essential internalDFN" href="#dfn-agent"><span class="insert">agent(id, [ attr1=val1, ...])</span></a></td><td rowspan="8"><a href="#component2"><span class="insert">Component 2: agents/responsibility</span></a></td></tr>
+<span class="delete">Start by Activity</span><span class="delete">wasStartedByActivity(id, a2, a1, attrs)</span>
 <tr class="component2-color"><span class="delete">Agent</span><span class="delete">agent(id, [ attr1=val1, ...])</span>
 <td class="essential"><a href="#concept-attribution" class="internalDFN">Attribution</a></td><td><a title="wasAttributedTo" href="#dfn-wasattributedto" class="internalDFN"><span class="delete">wasAttributedTo(id,e,ag,attr)</span><span class="essential"><span class="insert">wasAttributedTo(</span></span><span class="insert">id;</span><span class="essential"><span class="insert">e,ag</span></span><span class="insert">,attr</span><span class="essential"><span class="insert">)</span></span></a></td></tr>
 <tr class="component2-color"><td class="essential"><a href="#concept-association-core" class="internalDFN">Association</a></td><td><a title="wasAssociatedWith" href="#dfn-wasassociatedwith" class="internalDFN"><span class="delete">wasAssociatedWith(id,a,ag,pl,attrs)</span><span class="essential"><span class="insert">wasAssociatedWith(</span></span><span class="insert">id;</span><span class="essential"><span class="insert">a,ag</span></span><span class="insert">,pl,attrs</span><span class="essential"><span class="insert">)</span></span></a></td></tr>
-<tr class="component2-color"><td class="essential"><a href="#concept-responsibility" class="internalDFN">Responsibility</a></td><td><a title="actedOnBehalfOf" href="#dfn-actedonbehalfof" class="internalDFN"><span class="delete">actedOnBehalfOf(id,ag2,ag1,a,attrs)</span><span class="essential"><span class="insert">actedOnBehalfOf(</span></span><span class="insert">id;</span><span class="essential"><span class="insert">ag2,ag1</span></span><span class="insert">,a,attrs</span><span class="essential"><span class="insert">)</span></span></a></td></tr>
+<tr class="component2-color"><span class="delete">Responsibility</span><td class="essential"><a href="#concept-delegation" class="internalDFN"><span class="insert">Delegation</span></a></td><td><a title="actedOnBehalfOf" href="#dfn-actedonbehalfof" class="internalDFN"><span class="delete">actedOnBehalfOf(id,ag2,ag1,a,attrs)</span><span class="essential"><span class="insert">actedOnBehalfOf(</span></span><span class="insert">id;</span><span class="essential"><span class="insert">ag2,ag1</span></span><span class="insert">,a,attrs</span><span class="essential"><span class="insert">)</span></span></a></td></tr>
 <tr class="component2-color"><td class="provType"><a href="#concept-plan" class="internalDFN"><span class="insert">Plan</span></a></td><td><a title="plan" href="#concept-plan" class="internalDFN"><span class="insert">... prov:type='prov:Plan' ...</span></a></td>
 </tr><tr class="component2-color"><td class="provType"><a href="#concept-person" class="internalDFN"><span class="insert">Person</span></a></td><td><a title="person" href="#concept-person" class="internalDFN"><span class="insert">... prov:type='prov:Person' ...</span></a></td>
 </tr><tr class="component2-color"><td class="provType"><a href="#concept-organization" class="internalDFN"><span class="insert">Organization</span></a></td><td><a title="organization" href="#concept-organization" class="internalDFN"><span class="insert">... prov:type='prov:Organization' ...</span></a></td>
 </tr><tr class="component2-color"><td class="provType"><a title="software-agent" href="#concept-software-agent" class="internalDFN"><span class="insert">SoftwareAgent</span></a></td><td><a title="software-agent" href="#concept-software-agent" class="internalDFN"><span class="insert">... prov:type='prov:SoftwareAgent' ...</span></a></td>
-</tr><tr class="component3-color"><td class="essential"><a href="#concept-derivation" class="internalDFN">Derivation</a></td><td><a title="wasDerivedFrom" href="#dfn-wasderivedfrom" class="internalDFN"><span class="delete">wasDerivedFrom(id, </span><span class="essential"><span class="insert">wasDerivedFrom(</span></span><span class="insert">id; </span><span class="essential">e2, <span class="delete">e1,</span><span class="insert">e1</span></span><span class="insert">,</span> a, g2, u1, <span class="delete">attrs)</span><span class="insert">attrs</span><span class="essential"><span class="insert">)</span></span></a></td><td rowspan="5"><a href="#component3"><span class="insert">Component 3: derivation</span></a></td></tr>
+</tr><tr><td style="border-width: 0px; "></td><td style="border-width: 0px; "></td><td style="border-width: 0px; "></td></tr>
+
+<tr class="component3-color"><td class="essential"><a href="#concept-derivation" class="internalDFN">Derivation</a></td><td><a title="wasDerivedFrom" href="#dfn-wasderivedfrom" class="internalDFN"><span class="delete">wasDerivedFrom(id, </span><span class="essential"><span class="insert">wasDerivedFrom(</span></span><span class="insert">id; </span><span class="essential">e2, <span class="delete">e1,</span><span class="insert">e1</span></span><span class="insert">,</span> a, g2, u1, <span class="delete">attrs)</span><span class="insert">attrs</span><span class="essential"><span class="insert">)</span></span></a></td><td rowspan="5"><a href="#component3"><span class="insert">Component 3: derivation</span></a></td></tr>
 <tr class="component3-color"><td class="provType"><a href="#concept-revision" class="internalDFN">Revision</a></td><td><span class="delete">wasRevisionOf(id,e2,e1,ag,attrs)</span><a title="revision" href="#concept-revision" class="internalDFN"><span class="insert">... prov:type='prov:WasRevisionOf' ...</span></a></td></tr>
 <tr class="component3-color"><td class="provType"><a href="#concept-quotation" class="internalDFN">Quotation</a></td><td><span class="delete">wasQuotedFrom(id,e2,e1,ag2,ag1,attrs)</span><a title="quotation" href="#concept-quotation" class="internalDFN"><span class="insert">... prov:type='prov:WasQuotedFrom' ...</span></a></td></tr>
 <tr class="component3-color"><td class="provType"><a href="#concept-original-source" class="internalDFN">Original Source</a></td><td><span class="delete">hadOriginalSource(id,e2,e1,attrs)</span><a title="Original Source" href="#concept-original-source" class="internalDFN"><span class="insert">... prov:type='prov:HadOriginalSource' ...</span></a></td></tr>
 <tr class="component3-color"><td><a href="#concept-trace" class="internalDFN">Trace</a></td><td><a title="tracedTo" href="#dfn-tracedto" class="internalDFN"><span class="delete">tracedTo(id,e2,e1,attrs)</span><span class="insert">tracedTo(id;e2,e1,attrs)</span></a></td></tr>
+<tr><td style="border-width: 0px; "></td><td style="border-width: 0px; "></td><td style="border-width: 0px; "></td></tr>
+
 <tr class="component4-color"><td><a href="#concept-alternate" class="internalDFN">Alternate</a></td><td><a title="alternateOf" href="#dfn-alternateof" class="internalDFN">alternateOf(alt1, alt2)</a></td><td rowspan="2"><a href="#component4"><span class="insert">Component 4: alternate</span></a></td></tr>
 <tr class="component4-color"><td><a href="#concept-specialization" class="internalDFN">Specialization</a></td><td><a title="specializationOf" href="#dfn-specializationof" class="internalDFN">specializationOf(sub, super)</a></td></tr>
-<tr class="component6-color"><td><a title="bundle" href="#concept-bundle" class="internalDFN"><span class="insert">Bundle constructor</span></a></td><td><a title="dfn-bundle" href="#dfn-bundle-declaration" class="internalDFN"><span class="insert">bundle id description_1 ... description_n endBundle</span></a></td><td rowspan="3"><a href="#component5"><span class="insert">Component 5: bundles</span></a></td></tr>
-<tr class="component6-color"><td class="provType"><a title="bundle" href="#concept-bundle" class="internalDFN"><span class="insert">Bundle description</span></a></td><td><a><span class="insert">... prov:type='prov:Bundle' ...</span></a></td></tr>
-<tr class="component6-color"><td><a href="#concept-provenance-locator" class="internalDFN"><span class="insert">Provenance Locator</span></a></td><td><a title="hasProvenanceIn" href="#dfn-hasprovenancein" class="internalDFN"><span class="insert">hasProvenanceIn(id, subject, bundle, target, service, prov, attrs)</span></a></td></tr>
-<tr class="component5-color"><td class="provType"><a href="#concept-collection" class="internalDFN">Collection</a></td><td><span class="delete">Collection</span><a title="collection" href="#concept-collection" class="internalDFN"><span class="insert">... prov:type='prov:Collection' ...</span></a></td><td rowspan="6"><a href="#component6"><span class="insert">Component 6: Collections</span></a></td></tr>
-<tr class="component5-color"><td class="provType"><a href="#concept-dictionary" class="internalDFN">Dictionary</a></td><td><span class="delete">Dictionary</span><a title="dictionary" href="#concept-dictionary" class="internalDFN"><span class="insert">... prov:type='prov:Dictionary' ...</span></a></td></tr>
-<tr class="component5-color"><td class="provType"><a title="empty collection" href="#concept-empty-collection" class="internalDFN"><span class="insert">EmptyCollection</span></a></td><td><a title="empty collection" href="#concept-empty-collection" class="internalDFN"><span class="insert">... prov:type='prov:EmptyCollection' ...</span></a></td></tr>
-<tr class="component5-color"><td><a href="#concept-insertion" class="internalDFN">Insertion</a></td><td><a title="derivedByInsertionFrom" href="#dfn-derivedbyinsertionfrom" class="internalDFN"><span class="delete">derivedByInsertionFrom(id,</span><span class="insert">derivedByInsertionFrom(id;</span> c2, c1, {(key_1, e_1), ..., (key_n, e_n)}, attrs)</a></td></tr>
-<tr class="component5-color"><td><a href="#concept-removal" class="internalDFN">Removal</a></td><td><a title="derivedByRemovalFrom" href="#dfn-derivedbyremovalfrom" class="internalDFN"><span class="delete">derivedByRemovalFrom(id,</span><span class="insert">derivedByRemovalFrom(id;</span> c2, c1, {key_1, ... key_n}, attrs)</a></td></tr>
-<tr class="component5-color"><td><a href="#concept-membership" class="internalDFN">Membership</a></td><td><a title="memberOf" href="#dfn-memberof" class="internalDFN">memberOf(c, {(key_1, e_1), ..., (key_n, e_n)})
+<tr><td style="border-width: 0px; "></td><td style="border-width: 0px; "></td><td style="border-width: 0px; "></td></tr>
+
+<tr class="component5-color"><td><a title="bundle" href="#concept-bundle" class="internalDFN"><span class="insert">Bundle constructor</span></a></td><td><a title="dfn-bundle" href="#dfn-bundle-declaration" class="internalDFN"><span class="insert">bundle id description_1 ... description_n endBundle</span></a></td><td rowspan="3"><a href="#component5"><span class="insert">Component 5: bundles</span></a></td></tr>
+<tr class="component5-color"><td class="provType"><a title="bundle" href="#concept-bundle" class="internalDFN"><span class="insert">Bundle description</span></a></td><td><a><span class="insert">... prov:type='prov:Bundle' ...</span></a></td></tr>
+<tr class="component5-color"><td><a href="#concept-provenance-locator" class="internalDFN"><span class="insert">Provenance Locator</span></a></td><td><a title="hasProvenanceIn" href="#dfn-hasprovenancein" class="internalDFN"><span class="insert">hasProvenanceIn(id, subject, bundle, target, service, prov, attrs)</span></a></td></tr>
+<tr><td style="border-width: 0px; "></td><td style="border-width: 0px; "></td><td style="border-width: 0px; "></td></tr>
+
+<tr class="component6-color"><td class="provType"><a href="#concept-collection" class="internalDFN">Collection</a></td><td><span class="delete">Collection</span><a title="collection" href="#concept-collection" class="internalDFN"><span class="insert">... prov:type='prov:Collection' ...</span></a></td><td rowspan="6"><a href="#component6"><span class="insert">Component 6: Collections</span></a></td></tr>
+<tr class="component6-color"><td class="provType"><a href="#concept-dictionary" class="internalDFN">Dictionary</a></td><td><span class="delete">Dictionary</span><a title="dictionary" href="#concept-dictionary" class="internalDFN"><span class="insert">... prov:type='prov:Dictionary' ...</span></a></td></tr>
+<tr class="component6-color"><td class="provType"><a title="empty collection" href="#concept-empty-collection" class="internalDFN"><span class="insert">EmptyCollection</span></a></td><td><a title="empty collection" href="#concept-empty-collection" class="internalDFN"><span class="insert">... prov:type='prov:EmptyCollection' ...</span></a></td></tr>
+<tr class="component6-color"><td><a href="#concept-insertion" class="internalDFN">Insertion</a></td><td><a title="derivedByInsertionFrom" href="#dfn-derivedbyinsertionfrom" class="internalDFN"><span class="delete">derivedByInsertionFrom(id,</span><span class="insert">derivedByInsertionFrom(id;</span> c2, c1, {(key_1, e_1), ..., (key_n, e_n)}, attrs)</a></td></tr>
+<tr class="component6-color"><td><a href="#concept-removal" class="internalDFN">Removal</a></td><td><a title="derivedByRemovalFrom" href="#dfn-derivedbyremovalfrom" class="internalDFN"><span class="delete">derivedByRemovalFrom(id,</span><span class="insert">derivedByRemovalFrom(id;</span> c2, c1, {key_1, ... key_n}, attrs)</a></td></tr>
+<tr class="component6-color"><td><a href="#concept-membership" class="internalDFN">Membership</a></td><td><a title="memberOf" href="#dfn-memberof" class="internalDFN">memberOf(c, {(key_1, e_1), ..., (key_n, e_n)})
 <span class="delete">Note</span><span class="delete">note(id, [ attr1=val1, ...])</span>
 <span class="delete">Annotation</span><span class="delete">hasAnnotation(r,n)</span></a></td></tr>
 </tbody></table>
@@ -2101,7 +2199,7 @@
 <h3><span class="secno"><span class="delete">4.1</span><span class="insert">5.1</span> </span>Component 1: Entities and Activities</h3>
 
 <p>The first component of PROV-DM is concerned with <a title="entity" href="#concept-entity" class="internalDFN">entities</a> and <a title="activity" href="#concept-activity" class="internalDFN">activities</a>, and their interrelations: <a href="#concept-usage" class="internalDFN">Usage</a>, <a href="#concept-generation" class="internalDFN">Generation</a>, <a href="#concept-start" class="internalDFN">Start</a>, <a href="#concept-end" class="internalDFN">End</a>, <a href="#concept-invalidation" class="internalDFN">Invalidation</a>, <span class="insert">and </span><a href="#concept-communication" class="internalDFN">Communication<span class="delete">, and </span><span class="delete">Start by Activity</span></a>.  <a href="#figure-component1">Figure 5</a> uses UML to depict the first <span class="delete">component, with</span><span class="insert">component.
-Core structures are displayed in the yellow area, consisting of</span> two classes <span class="insert">(</span><a href="#concept-entity" class="internalDFN"><span class="insert">Entity</span></a><span class="insert">, </span><a href="#concept-activity" class="internalDFN"><span class="insert">Activity</span></a><span class="insert">) </span>and <span class="insert">two </span>binary associations between <span class="delete">them. Associations are not just binary: indeed, </span><span class="insert">them (</span><a href="#concept-usage" class="internalDFN">Usage</a>, <a href="#concept-generation" class="internalDFN">Generation</a><span class="insert">). The rest of the figure displays extended structures, including UML associations classes (represented in gray) to express expanded n-ary relations (for </span><a href="#concept-usage" class="internalDFN"><span class="insert">Usage</span></a><span class="insert">, </span><a href="#concept-generation" class="internalDFN"><span class="insert">Generation</span></a><span class="insert">, </span><a href="#concept-invalidation" class="internalDFN"><span class="insert">Invalidation</span></a>, <a href="#concept-start" class="internalDFN">Start</a>, <a href="#concept-end" class="internalDFN">End</a><span class="insert">,  </span><a href="#concept-communication" class="internalDFN"><span class="insert">Communication</span></a><span class="insert">). The figure</span> also <span class="delete">include</span><span class="insert">makes explicit</span> <em>time</em> <span class="delete">attributes.</span><span class="insert">attributes for these concepts (time being represented as a primitive).</span>
+Core structures are displayed in the yellow area, consisting of</span> two classes <span class="insert">(</span><a href="#concept-entity" class="internalDFN"><span class="insert">Entity</span></a><span class="insert">, </span><a href="#concept-activity" class="internalDFN"><span class="insert">Activity</span></a><span class="insert">) </span>and <span class="insert">three </span>binary associations between <span class="delete">them. Associations are not just binary: indeed, </span><span class="insert">them (</span><a href="#concept-usage" class="internalDFN">Usage</a>, <a href="#concept-generation" class="internalDFN">Generation</a>, <span class="insert">and </span><a href="#concept-communication" class="internalDFN"><span class="insert">Communication</span></a><span class="insert">). The rest of the figure displays extended structures, including UML associations classes (represented in gray) to express expanded n-ary relations (for </span><a href="#concept-usage" class="internalDFN"><span class="insert">Usage</span></a><span class="insert">, </span><a href="#concept-generation" class="internalDFN"><span class="insert">Generation</span></a><span class="insert">, </span><a href="#concept-invalidation" class="internalDFN"><span class="insert">Invalidation</span></a><span class="insert">, </span><a href="#concept-start" class="internalDFN">Start</a>, <a href="#concept-end" class="internalDFN">End</a><span class="insert">). The figure</span> also <span class="delete">include</span><span class="insert">makes explicit associations with</span> <em>time</em> <span class="delete">attributes.</span><span class="insert">for these concepts (time being marked with the primitive stereotype).</span>
 </p>
 
 <div style="text-align: center;">
@@ -2109,7 +2207,6 @@
 
 <figure>
 
-
 <img src="uml/component1.png" alt="entities and activities">
 <figcaption id="figure-component1">Figure 5: Entities and Activities Component Overview
 </figcaption>
@@ -2139,7 +2236,7 @@
 The following expression</p>
 <pre class="codeexample">entity(tr:WD-prov-dm-20111215, [ prov:type="document", ex:version="2" ])
 </pre>
-states the existence of an entity, denoted by identifier <span class="name">tr:WD-prov-dm-20111215</span>,  with type <span class="name">document</span> and version number <span class="name">2</span>. The attribute <span class="name">ex:version</span> is application specific, whereas the attribute <span class="name">type</span> (see <a href="#term-attribute-type">Section 4.7.4.4</a>) is reserved in the <a title="prov-namespace" href="#dfn-prov-namespace" class="internalDFN">PROV namespace</a>.
+states the existence of an entity, denoted by identifier <span class="name">tr:WD-prov-dm-20111215</span>,  with type <span class="name">document</span> and version number <span class="name">2</span>. The attribute <span class="name">ex:version</span> is application specific, whereas the attribute <span class="name">type</span> (see <a href="#term-attribute-type">Section <span class="delete">4.7.4.4</span><span class="insert">5.7.4.4</span></a>) is reserved in the <a title="prov-namespace" href="#dfn-prov-namespace" class="internalDFN">PROV namespace</a>.
 
 </div>
 
@@ -2168,7 +2265,7 @@
 <pre class="codeexample">activity(a1,2011-11-16T16:05:00,2011-11-16T16:06:00,
         <span class="delete">[ex:host="server.example.org",prov:type="ex:edit" %% xsd:QName])</span><span class="insert">[ ex:host="server.example.org", prov:type='ex:edit' ])</span>
 </pre>
-<p>states the existence of an activity with identifier <span class="name">a1</span>, start time <span class="name">2011-11-16T16:05:00</span>, and end time <span class="name">2011-11-16T16:06:00</span>, running on host <span class="name">server.example.org</span>, and of type <span class="name">edit</span>.  The attribute <span class="name">host</span>  is application specific  (declared in some namespace with prefix <span class="name">ex</span>).  The attribute <span class="name">type</span> is a reserved attribute of PROV-DM, allowing for sub-typing to be expressed  (see <a href="#term-attribute-type">Section 4.7.4.4</a>).</p>
+<p>states the existence of an activity with identifier <span class="name">a1</span>, start time <span class="name">2011-11-16T16:05:00</span>, and end time <span class="name">2011-11-16T16:06:00</span>, running on host <span class="name">server.example.org</span>, and of type <span class="name">edit</span>.  The attribute <span class="name">host</span>  is application specific  (declared in some namespace with prefix <span class="name">ex</span>).  The attribute <span class="name">type</span> is a reserved attribute of PROV-DM, allowing for sub-typing to be expressed  (see <a href="#term-attribute-type">Section <span class="delete">4.7.4.4</span><span class="insert">5.7.4.4</span></a>).</p>
 </div>
 
 
@@ -2199,7 +2296,7 @@
 
 <li><span class="attribute" id="generation.attributes">attributes</span>:  an <em class="rfc2119" title="optional">optional</em> set (<span class="name">attrs</span>) of attribute-value pairs representing additional information about this generation.</li>
 </ul></div>
-<p>While each of <span class="attribute">activity</span>, <span class="attribute">time</span>, and  <span class="attribute">attributes</span> is <em class="rfc2119" title="optional">optional</em>, at least one of them <em class="rfc2119" title="must">must</em> be present.</p>
+<p>While each of <a href="#generation.id"><span class="attribute"><span class="insert">id</span></span></a><span class="insert">, </span><a href="#generation.activity"><span class="attribute">activity</span></a>, <a href="#generation.time"><span class="attribute">time</span></a>, and  <a href="#generation.attributes"><span class="attribute">attributes</span></a> is <em class="rfc2119" title="optional">optional</em>, at least one of them <em class="rfc2119" title="must">must</em> be present.</p>
 
 
 
@@ -2208,8 +2305,8 @@
 <div class="anexample">
 <p>
 The following expressions</p>
-<pre class="codeexample">  wasGeneratedBy(e1,a1, 2001-10-26T21:32:52, [ex:port="p1"])
-  wasGeneratedBy(e2,a1, 2001-10-26T10:00:00, [ex:port="p2"])
+<pre class="codeexample">  <span class="delete">wasGeneratedBy(e1,a1,</span><span class="insert">wasGeneratedBy(e1, a1,</span> 2001-10-26T21:32:52, <span class="delete">[ex:port="p1"])</span><span class="insert">[ ex:port="p1" ])</span>
+  <span class="delete">wasGeneratedBy(e2,a1,</span><span class="insert">wasGeneratedBy(e2, a1,</span> 2001-10-26T10:00:00, <span class="delete">[ex:port="p2"])</span><span class="insert">[ ex:port="p2" ])</span>
 </pre>
 <p>state the existence of two generations (with respective times <span class="name">2001-10-26T21:32:52</span> and <span class="name">2001-10-26T10:00:00</span>), at which new entities,  identified by <span class="name">e1</span> and <span class="name">e2</span>, are created by an
 activity,  identified by <span class="name">a1</span>.
@@ -2221,7 +2318,7 @@
 <div class="anexample">
 <p>
 In some cases, we may want to record the time at which an entity was generated without having to specify the activity that generated it. To support this requirement, the activity element in generation is optional. Hence,  the following expression indicates the time at which an entity is generated, without naming the activity that did it.</p>
-<pre class="codeexample">  wasGeneratedBy(e,-,2001-10-26T21:32:52)
+<pre class="codeexample">  <span class="delete">wasGeneratedBy(e,-,2001-10-26T21:32:52)</span><span class="insert">wasGeneratedBy(e, -, 2001-10-26T21:32:52)</span>
 </pre>
 </div>
 
@@ -2238,12 +2335,14 @@
 <p></p><div class="attributes" id="attributes-usage"><dfn title="used" id="dfn-used">Usage</dfn><span class="withPn">, written <span class="pnExpression"><span class="delete">used(id,a,e,t,attrs)</span><span class="insert">used(id;a,e,t,attrs)</span></span> in PROV-N,</span> has:
 <ul>
 <li><span class="attribute" id="usage.id">id</span>:  an <em class="rfc2119" title="optional">optional</em> identifier for a usage;</li> 
-<li><span class="attribute" id="usage.activity">activity</span>: an identifier (<span class="name">a</span>) for the consuming activity;</li>
-<li><span class="attribute" id="usage.entity">entity</span>: an identifier (<span class="name">e</span>) for the consumed entity;</li>
+<li><span class="attribute" id="usage.activity">activity</span>: an identifier (<span class="name">a</span>) for the <span class="delete">consuming activity;</span><span class="insert">activity that used an entity;</span></li>
+<li><span class="attribute" id="usage.entity">entity</span>: an <em class="rfc2119" title="optional"><span class="insert">optional</span></em> identifier (<span class="name">e</span>) for the<span class="delete"> consumed entity;</span><span class="insert">  entity being used;</span></li>
 <li><span class="attribute" id="usage.time">time</span>: an <em class="rfc2119" title="optional">optional</em> "usage time" (<span class="name">t</span>), the time at which the entity started to be used;</li>
 <li><span class="attribute" id="usage.attributes">attributes</span>: an <em class="rfc2119" title="optional">optional</em> set (<span class="name">attrs</span>) of attribute-value pairs representing additional information about this usage.</li>
 </ul></div>
 
+<p><span class="insert">While each of </span><a href="#usage.id"><span class="attribute"><span class="insert">id</span></span></a><span class="insert">, </span><a href="#usage.entity"><span class="attribute"><span class="insert">entity</span></span></a><span class="insert">, </span><a href="#usage.time"><span class="attribute"><span class="insert">time</span></span></a><span class="insert">, and  </span><a href="#usage.attributes"><span class="attribute"><span class="insert">attributes</span></span></a><span class="insert"> is </span><em class="rfc2119" title="optional"><span class="insert">optional</span></em><span class="insert">, at least one of them </span><em class="rfc2119" title="must"><span class="insert">must</span></em><span class="insert"> be present.</span></p>
+
 <p>
 A reference to a given entity <em class="rfc2119" title="may">may</em> appear in multiple usages that share
  a given activity identifier. 
@@ -2252,8 +2351,8 @@
 
 <div class="anexample">
 <p>The following usages</p>
-<pre class="codeexample">  used(a1,e1,2011-11-16T16:00:00,[ex:parameter="p1"])
-  used(a1,e2,2011-11-16T16:00:01,[ex:parameter="p2"])
+<pre class="codeexample">  <span class="delete">used(a1,e1,2011-11-16T16:00:00,[ex:parameter="p1"])</span><span class="insert">used(a1, e1, 2011-11-16T16:00:00, [ ex:parameter="p1" ])</span>
+  <span class="delete">used(a1,e2,2011-11-16T16:00:01,[ex:parameter="p2"])</span><span class="insert">used(a1, e2, 2011-11-16T16:00:01, [ ex:parameter="p2" ])</span>
 </pre>
 <p>state that the activity identified by <span class="name">a1</span> used two entities identified by <span class="name">e1</span> and <span class="name">e2</span>, at times <span class="name">2011-11-16T16:00:00</span> and  <span class="name">2011-11-16T16:00:01</span>, respectively; the first
 one was found as the value of parameter <span class="name">p1</span>, whereas the second was found as value of parameter <span class="name">p2</span>.  The semantics of <span class="name">parameter</span> is application specific.</p>
@@ -2267,8 +2366,45 @@
 </div>
 
 
+
+
+<div id="term-wasInformedBy" class="section">
+<h4><span class="secno"><span class="delete">4.1.5</span><span class="insert">5.1.5 </span></span><span class="insert">Communication</span></h4>
+
+<div class="glossary-ref">   <dfn id="concept-communication"><span class="insert">Communication</span></dfn><span class="insert"> is the exchange of an entity by two activities, one activity using the entity generated by the other. </span></div>
+
+
+<p><span class="insert">A communication implies that activity  </span><span class="name"><span class="insert">a2</span></span><span class="insert"> is dependent on another </span><span class="name"><span class="insert">a1</span></span><span class="insert">, by way of some unspecified entity that is generated by </span><span class="name"><span class="insert">a1</span></span><span class="insert"> and used by </span><span class="name"><span class="insert">a2</span></span><span class="insert">.</span></p>
+
+
+
+
+<p></p><div class="attributes" id="attributes-wasInformedBy"><span class="insert">
+A </span><dfn title="wasInformedBy" id="dfn-wasinformedby"><span class="insert">communication</span></dfn><span class="withPn"><span class="insert">, written as 
+</span><span class="pnExpression"><span class="insert">wasInformedBy(id;a2,a1,attrs)</span></span><span class="insert"> in PROV-N,</span></span><span class="insert"> has: 
+</span><ul>
+<li><span class="attribute" id="wasInformedBy.id"><span class="insert">id</span></span><span class="insert">:  an </span><em class="rfc2119" title="optional"><span class="insert">optional</span></em><span class="insert"> identifier  identifying the relation;</span></li> 
+<li><span class="attribute" id="wasInformedBy.informed"><span class="insert">informed</span></span><span class="insert">: the identifier (</span><span class="name"><span class="insert">a2</span></span><span class="insert">) of the informed activity;
+</span></li><li><span class="attribute" id="wasInformedBy.informant"><span class="insert">informant</span></span><span class="insert">: the identifier (</span><span class="name"><span class="insert">a1</span></span><span class="insert">) of the informant activity;
+</span></li><li><span class="attribute" id="wasInformedBy.attributes"><span class="insert">attributes</span></span><span class="insert">: an </span><em class="rfc2119" title="optional"><span class="insert">optional</span></em><span class="insert"> set (</span><span class="name"><span class="insert">attrs</span></span><span class="insert">) of attribute-value pairs representing additional information about this communication.</span></li>
+</ul>
+</div>
+
+
+
+<div class="anexample">
+<p><span class="insert">
+Consider two activities  </span><span class="name"><span class="insert">a1</span></span><span class="insert"> and </span><span class="name"><span class="insert">a2</span></span><span class="insert">, the former performed by a government agency, and the latter by a driver caught speeding. 
+</span></p><pre class="codeexample"><span class="insert">activity(a1, [ prov:type="traffic regulations enforcing" ])
+activity(a2, [ prov:type="fine paying, check writing, and mailing" ])
+wasInformedBy(a2, a1)
+</span></pre><span class="insert">
+The last line indicates that some implicit entity was generated by  </span><span class="name"><span class="insert">a1</span></span><span class="insert"> and used by  </span><span class="name"><span class="insert">a2</span></span><span class="insert">; this entity may be a traffic ticket that had a notice of fine, amount, and payment mailing details.
+</span></div>
+</div>
+
 <div id="term-Start" class="section">
-<h4><span class="secno"><span class="delete">4.1.5</span><span class="insert">5.1.5</span> </span>Start</h4>
+<h4><span class="secno"><span class="insert">5.1.6</span> </span>Start</h4>
 
 <div class="glossary-ref">   <span class="delete">Start</span><span class="delete"> is when an activity is deemed to have started.  The activity did not exist before its start. Any usage or generation involving an activity follows the activity's start. A start may refer to an entity, known as </span><span class="delete">trigger</span><span class="delete">, that initiated the activity. </span></div>
 
@@ -2340,7 +2476,7 @@
 </div>
 
 <div id="term-End" class="section">
-<h4><span class="secno"><span class="delete">4.1.6</span><span class="insert">5.1.6</span> </span>End</h4>
+<h4><span class="secno"><span class="delete">4.1.6</span><span class="insert">5.1.7</span> </span>End</h4>
 
 <div class="glossary-ref">   <dfn id="concept-end">End</dfn> is when an activity is deemed to have ended.  The activity no longer exists after its end. Any usage, generation, or invalidation involving an activity precedes the activity's end. An end may refer to an entity, known as <dfn id="concept-end-trigger">trigger</dfn>, that terminated the <span class="delete">activity.</span><span class="insert">activity, or to an activity, known as </span><dfn id="concept-end-ender"><span class="insert">ender</span></dfn><span class="insert"> that generated the trigger.</span> </div>
 
@@ -2369,7 +2505,7 @@
 </div>
 
 <div id="term-Invalidation" class="section">
-<h4><span class="secno"><span class="delete">4.1.7</span><span class="insert">5.1.7</span> </span>Invalidation</h4>
+<h4><span class="secno"><span class="delete">4.1.7</span><span class="insert">5.1.8</span> </span>Invalidation</h4>
 
 
 <div class="glossary-ref">   <dfn id="concept-invalidation">Invalidation</dfn> is the start of the destruction, cessation, or expiry of an existing entity by an activity. The entity is no longer available for use after invalidation. Any generation or usage of an entity precedes its invalidation.</div>
@@ -2401,7 +2537,7 @@
 
 <li><span class="attribute">attributes</span>:  an <em class="rfc2119" title="optional">optional</em> set of attribute-value pairs representing additional information about this invalidation.</li>
 </ul></div>
-<p>While each of <span class="attribute">activity</span>, <span class="attribute">time</span>, and  <span class="attribute">attributes</span> is <em class="rfc2119" title="optional">optional</em>, at least one of them <em class="rfc2119" title="must">must</em> be present.</p>
+<p>While each of <span class="attribute"><span class="insert">id</span></span><span class="insert">, </span><span class="attribute">activity</span>, <span class="attribute">time</span>, and  <span class="attribute">attributes</span> is <em class="rfc2119" title="optional">optional</em>, at least one of them <em class="rfc2119" title="must">must</em> be present.</p>
 
 
 
@@ -2428,7 +2564,7 @@
 wasGeneratedBy  (ex:bbcNews2012-04-03,-,2012-04-03T00:00:01)
 wasInvalidatedBy(ex:bbcNews2012-04-03,-,2012-04-03T23:59:59)
 </pre>
-We refer to example <a href="#anexample-specialization">anexample-specialization</a> for further descriptions of the BBC Web site, and to Section <a href="#concept-membership" class="internalDFN">Membership</a> for a description of the relation <a href="#dfn-memberof" class="internalDFN">memberOf</a>.
+We refer to example <a href="#anexample-specialization">anexample-specialization</a> for further descriptions of the BBC Web site, and to   <a href="#term-dictionary-membership">Section <span class="delete">Membership</span><span class="insert">5.6.5</span></a> for a description of the relation <a href="#dfn-memberof" class="internalDFN">memberOf</a>.
 </div>
 
 
@@ -2461,40 +2597,40 @@
 </div>
 
 
-<div id="term-wasInformedBy" class="section">
-<h4><span class="secno"><span class="delete">4.1.8</span><span class="insert">5.1.8</span> </span>Communication</h4>
-
-<div class="glossary-ref">   <dfn id="concept-communication">Communication</dfn> is the exchange of an entity by two activities, one activity using the entity generated by the other. </div>
-
-
-<p>A communication implies that activity  <span class="name">a2</span> is dependent on another <span class="name">a1</span>, by way of some unspecified entity that is generated by <span class="name">a1</span> and used by <span class="name">a2</span>.</p>
-
-
-
-
-<p></p><div class="attributes" id="attributes-wasInformedBy">
-A <dfn title="wasInformedBy" id="dfn-wasinformedby">communication</dfn><span class="withPn">, written as 
-<span class="pnExpression"><span class="delete">wasInformedBy(id,a2,a1,attrs)</span><span class="insert">wasInformedBy(id;a2,a1,attrs)</span></span> in PROV-N,</span> has: 
-<ul>
-<li><span class="attribute" id="wasInformedBy.id">id</span>:  an <em class="rfc2119" title="optional">optional</em> identifier  identifying the relation;</li> 
-<li><span class="attribute" id="wasInformedBy.informed">informed</span>: the identifier (<span class="name">a2</span>) of the informed activity;
-</li><li><span class="attribute" id="wasInformedBy.informant">informant</span>: the identifier (<span class="name">a1</span>) of the informant activity;
-</li><li><span class="attribute" id="wasInformedBy.attributes">attributes</span>: an <em class="rfc2119" title="optional">optional</em> set (<span class="name">attrs</span>) of attribute-value pairs representing additional information about this communication.</li>
-</ul>
-</div>
-
-
-
-<div class="anexample">
-<p>
-Consider two activities  <span class="name">a1</span> and <span class="name">a2</span>, the former performed by a government agency, and the latter by a driver caught speeding. 
-</p><pre class="codeexample">activity(a1, [prov:type="traffic regulations enforcing"])
+
+<span class="delete">4.1.8 </span><span class="delete">Communication</span>
+
+   <span class="delete">Communication</span><span class="delete"> is the exchange of an entity by two activities, one activity using the entity generated by the other. </span>
+
+
+<span class="delete">A communication implies that activity  </span><span class="delete">a2</span><span class="delete"> is dependent on another </span><span class="delete">a1</span><span class="delete">, by way of some unspecified entity that is generated by </span><span class="delete">a1</span><span class="delete"> and used by </span><span class="delete">a2</span><span class="delete">.</span>
+
+
+
+
+<span class="delete">
+A </span><span class="delete">communication</span><span class="delete">, written as 
+</span><span class="delete">wasInformedBy(id,a2,a1,attrs)</span><span class="delete"> in PROV-N,</span><span class="delete"> has: 
+</span>
+<span class="delete">id</span><span class="delete">:  an </span><span class="delete">optional</span><span class="delete"> identifier  identifying the relation;</span> 
+<span class="delete">informed</span><span class="delete">: the identifier (</span><span class="delete">a2</span><span class="delete">) of the informed activity;
+</span><span class="delete">informant</span><span class="delete">: the identifier (</span><span class="delete">a1</span><span class="delete">) of the informant activity;
+</span><span class="delete">attributes</span><span class="delete">: an </span><span class="delete">optional</span><span class="delete"> set (</span><span class="delete">attrs</span><span class="delete">) of attribute-value pairs representing additional information about this communication.</span>
+
+
+
+
+
+
+<span class="delete">
+Consider two activities  </span><span class="delete">a1</span><span class="delete"> and </span><span class="delete">a2</span><span class="delete">, the former performed by a government agency, and the latter by a driver caught speeding. 
+</span><span class="delete">activity(a1, [prov:type="traffic regulations enforcing"])
 activity(a2, [prov:type="fine paying, check writing, and mailing"])
 wasInformedBy(a2,a1)
-</pre>
-The last line indicates that some implicit entity was generated by  <span class="name">a1</span> and used by  <span class="name">a2</span>; this entity may be a traffic ticket that had a notice of fine, amount, and payment mailing details.
-</div>
-</div>
+</span><span class="delete">
+The last line indicates that some implicit entity was generated by  </span><span class="delete">a1</span><span class="delete"> and used by  </span><span class="delete">a2</span><span class="delete">; this entity may be a traffic ticket that had a notice of fine, amount, and payment mailing details.
+</span>
+
 
 
 <span class="delete">4.1.9 </span><span class="delete">Start by Activity</span>
@@ -2529,15 +2665,21 @@
 
 
 
+
+
+
+
+
+
 </div>
 
 <div id="component2" class="section"> 
 <h3><span class="secno"><span class="delete">4.2</span><span class="insert">5.2</span> </span>Component 2: Agents and Responsibility</h3>
 
 <p>The second component of <span class="delete">PROV-DM</span><span class="insert">PROV-DM, depicted in  </span><a href="#figure-component2"><span class="insert">Figure 6</span></a><span class="insert">,</span> is concerned with <a title="agent" href="#concept-agent" class="internalDFN">agents</a> and the notions of
-<a href="#concept-attribution" class="internalDFN">Attribution</a>, <a href="#concept-association-core" class="internalDFN">Association</a>, <a href="#concept-responsibility" class="internalDFN">Responsibility</a>, relating agents to entities, activities, and agents, respectively.<span class="delete">
+<a href="#concept-attribution" class="internalDFN">Attribution</a>, <a href="#concept-association-core" class="internalDFN">Association</a>, <span class="delete">Responsibility</span><a href="#concept-delegation" class="internalDFN"><span class="insert">Delegation</span></a>, relating agents to entities, activities, and agents, respectively.<span class="delete">
 Figure </span><span class="delete">figure-component2</span><span class="delete"> depicts the second component with four</span><span class="insert">
- Core structures are displayed in the yellow area and include three</span> classes <span class="delete">(Entity, Activity,  Agent, </span>and <span class="delete">Plan)</span><span class="insert">three binary associations. Outside the yellow area, extended structures comprise the subclass </span><a href="#concept-plan" class="internalDFN"><span class="insert">Plan</span></a> and <span class="delete">associations between them. </span>UML association classes <span class="delete">are used </span>to express<span class="insert"> expanded</span> n-ary relations.
+ Core structures are displayed in the yellow area and include three</span> classes <span class="delete">(Entity, Activity,  Agent, </span>and <span class="delete">Plan)</span><span class="insert">three binary associations. Outside the yellow area, extended structures comprise</span> and <span class="delete">associations between them. </span>UML association classes <span class="insert">to express expanded n-ary relations, and subclasses </span><a href="#concept-plan" class="internalDFN"><span class="insert">Plan</span></a><span class="insert">, </span><a href="#concept-person" class="internalDFN"><span class="insert">Person</span></a><span class="insert">, </span><a title="software-agent" href="#concept-software-agent" class="internalDFN"><span class="insert">SofwareAgent</span></a><span class="insert">, and </span><a href="#concept-organization" class="internalDFN"><span class="insert">Organization</span></a><span class="insert">. The subclasses </span>are <span class="delete">used</span><span class="insert">marked by the UML stereotype "prov:type"</span> to <span class="delete">express n-ary relations.</span><span class="insert">indicate that that these are valid values for the attribute </span><a href="#term-attribute-type"><span class="insert">prov:type</span></a>
 </p>
 
 
@@ -2547,7 +2689,7 @@
 <figure>
 
 <img src="uml/component2.png" alt="agents and responsibilities">
-<figcaption id="figure-component2">Figure 6: Agents and Responsibilities Component Overview
+<figcaption id="figure-component2">Figure 6: Agents and <span class="delete">Responsibilities</span><span class="insert">Responsibility</span> Component Overview
 </figcaption>
 </figure>
 </div>
@@ -2578,7 +2720,7 @@
 
 <li><span class="name">Organization</span>
 
-<div class="glossary-ref">   Agents of type <dfn id="concept-organization" title="organization">Organization</dfn>  are social or legal institutions such as companies, societies, etc. </div>
+<div class="glossary-ref">   Agents of type <dfn id="concept-organization">Organization</dfn>  are social or legal institutions such as companies, societies, etc. </div>
 
 <p></p></li>
 
@@ -2611,15 +2753,15 @@
 <ul>
 <li><span class="attribute" id="attribution.id">id</span>: an <em class="rfc2119" title="optional">optional</em> identifier for the relation;</li> 
 <li><span class="attribute" id="attribution.entity">entity</span>: an entity identifier (<span class="name">e</span>);</li>
-<li><span class="attribute" id="attribution.agent">agent</span>: the identifier (<span class="name">ag</span>) of the agent whom the entity is ascribed to;</li>
+<li><span class="attribute" id="attribution.agent">agent</span>: the identifier (<span class="name">ag</span>) of the agent whom the entity is ascribed <span class="delete">to;</span><span class="insert">to, and therefore bears some responsibility for its existence;</span></li>
 <li><span class="attribute" id="attribution.attributes">attributes</span>: an <em class="rfc2119" title="optional">optional</em> set (<span class="name">attrs</span>) of attribute-value pairs representing additional information about this attribution.</li>
 </ul>
 </div>
 
 <div class="anexample" id="anexample-attribution">
 <p>
-Revisiting the example of <a href="#section-example-one">Section 3.1</a>,
-we can ascribe <span class="name">tr:WD-prov-dm-20111215</span> to some agents without an explicit activity. The reserved attribute <span class="name">role</span> (see <a href="#term-attribute-role">Section 4.7.4.3</a>) allows for role of the agent in the attribution to be specified.
+Revisiting the example of <a href="#section-example-one">Section <span class="delete">3.1</span><span class="insert">4.1</span></a>,
+we can ascribe <span class="name">tr:WD-prov-dm-20111215</span> to some agents without an explicit activity. The reserved attribute <span class="name">role</span> (see <a href="#term-attribute-role">Section <span class="delete">4.7.4.3</span><span class="insert">5.7.4.3</span></a>) allows for role of the agent in the attribution to be specified.
 </p><pre class="codeexample">agent(ex:Paolo, [ prov:type="Person" ])
 agent(ex:Simon, [ prov:type="Person" ])
 entity(tr:WD-prov-dm-20111215, [ <span class="delete">prov:type="process:RecsWD" %% xsd:QName </span><span class="insert">prov:type='rec54:WD'  </span>])
@@ -2680,18 +2822,18 @@
 
 </div>  
 
-<div id="term-responsibility" class="section">
-
-<h4><span class="secno"><span class="delete">4.2.4</span><span class="insert">5.2.4</span> </span>Responsibility</h4>
-
-<div class="glossary-ref">    <dfn id="concept-responsibility">Responsibility</dfn> is the fact that an agent is accountable for the actions of a "subordinate" agent, in the context of an activity.  </div>
-
-<p>PROV offers a mild version of responsibility
+<div id="term-delegation" class="section">
+
+<h4><span class="secno"><span class="delete">4.2.4 </span><span class="delete">Responsibility</span><span class="insert">5.2.4 </span></span><span class="insert">Delegation</span></h4>
+
+<div class="glossary-ref">    <span class="delete">Responsibility</span>   <dfn id="concept-delegation"><span class="insert">Delegation</span></dfn> is the <span class="delete">fact</span><span class="insert">assignment of authority to an agent (by itself or by another agent)  to carry out a specific activity as a delegate or representative, while the agent</span> that <span class="delete">an agent is accountable</span><span class="insert">it represents remains responsible</span> for the <span class="delete">actions of a "subordinate" agent, in the context of an activity.  </span><span class="insert">outcome of the delegated work. </span></div>
+
+<p><span class="delete">PROV offers a mild version of responsibility
 in the form of a relation to represent when an agent acted on another
 agent's behalf.  So for example someone running a mail program,
 the program and the person are both
 agents of the activity; furthermore, the mail software
-agent is running on the person's behalf.  In another example, the
+agent is running on the person's behalf.  In another</span><span class="insert">For</span> example, <span class="delete">the</span><span class="insert">a</span>
 student acted on behalf of his supervisor, who acted on behalf of the
 department chair, who acted on behalf of the university; all those
 agents are responsible in some way for the activity that took place but
@@ -2700,22 +2842,22 @@
 
 
 <p>
-</p><div class="attributes" id="attributes-responsibility">
-A <dfn title="actedOnBehalfOf" id="dfn-actedonbehalfof">responsibility</dfn> link<span class="withPn">, written <span class="pnExpression"><span class="delete">actedOnBehalfOf(id,ag2,ag1,a,attrs)</span><span class="insert">actedOnBehalfOf(id;ag2,ag1,a,attrs)</span></span> in PROV-N,</span> has:
+</p><div class="attributes" id="attributes-delegation">
+A <dfn title="actedOnBehalfOf" id="dfn-actedonbehalfof"><span class="delete">responsibility</span><span class="insert">delegation</span></dfn> link<span class="withPn">, written <span class="pnExpression"><span class="delete">actedOnBehalfOf(id,ag2,ag1,a,attrs)</span><span class="insert">actedOnBehalfOf(id;ag2,ag1,a,attrs)</span></span> in PROV-N,</span> has:
 <ul>
-<li><span class="attribute" id="responsibility.id">id</span>:  an <em class="rfc2119" title="optional">optional</em> identifier for the responsibility link between subordinate and responsible;</li> 
-<li><span class="attribute" id="responsibility.subordinate">subordinate</span>: an identifier (<span class="name">ag2</span>) for the agent associated with an activity, acting on behalf of the responsible
+<li><span class="attribute" id="delegation.id">id</span>:  an <em class="rfc2119" title="optional">optional</em> identifier for the <span class="delete">responsibility</span><span class="insert">delegation</span> link between <span class="delete">subordinate</span><span class="insert">delegate</span> and responsible;</li> 
+<li><span class="delete">subordinate</span><span class="attribute" id="delegation.delegate"><span class="insert">delegate</span></span>: an identifier (<span class="name">ag2</span>) for the agent associated with an activity, acting on behalf of the responsible
 agent;</li>
-<li><span class="attribute" id="responsibility.responsible">responsible</span>: an identifier (<span class="name">ag1</span>) for the agent,  on behalf of which the subordinate agent acted;</li>
-<li><span class="attribute" id="responsibility.activity">activity</span>: an <em class="rfc2119" title="optional">optional</em> identifier (<span class="name">a</span>) of an activity for which the responsibility link holds;</li>
-<li><span class="attribute" id="responsibility.attributes">attributes</span>: an <em class="rfc2119" title="optional">optional</em> set (<span class="name">attrs</span>) of attribute-value pairs representing additional information about this responsibility link.</li>
+<li><span class="attribute" id="delegation.responsible">responsible</span>: an identifier (<span class="name">ag1</span>) for the agent,  on behalf of which the <span class="delete">subordinate</span><span class="insert">delegate</span> agent acted;</li>
+<li><span class="attribute" id="delegation.activity">activity</span>: an <em class="rfc2119" title="optional">optional</em> identifier (<span class="name">a</span>) of an activity for which the <span class="delete">responsibility</span><span class="insert">delegation</span> link holds;</li>
+<li><span class="attribute" id="delegation.attributes">attributes</span>: an <em class="rfc2119" title="optional">optional</em> set (<span class="name">attrs</span>) of attribute-value pairs representing additional information about this <span class="delete">responsibility</span><span class="insert">delegation</span> link.</li>
 </ul></div>
 
 
 <div class="anexample">
 <p>The following fragment describes three agents: a programmer, a researcher, and a funder.  The programmer and researcher are associated with a workflow activity.  The programmer acts on behalf
-of the researcher (delegation) encoding the commands specified by the researcher; the researcher acts on behalf of the funder, who has a contractual agreement with the researcher. The terms
-'delegation' and 'contact' used in this example are domain specific.</p>
+of the researcher <span class="delete">(delegation)</span><span class="insert">(line-management)</span> encoding the commands specified by the researcher; the researcher acts on behalf of the funder, who has a contractual agreement with the researcher. The terms
+<span class="delete">'delegation'</span><span class="insert">'line-management'</span> and <span class="delete">'contact'</span><span class="insert">'contract'</span> used in this example are domain specific.</p>
 <pre class="codeexample">activity(a,[prov:type="workflow"])
 agent(ag1,[prov:type="programmer"])
 agent(ag2,[prov:type="researcher"])
@@ -2723,7 +2865,7 @@
 wasAssociatedWith(a,ag1,[prov:role="loggedInUser"])
 wasAssociatedWith(a,ag2)
 wasAssociatedWith(a,ag3)
-actedOnBehalfOf(ag1,ag2,a,[prov:type="delegation"])
+<span class="delete">actedOnBehalfOf(ag1,ag2,a,[prov:type="delegation"])</span><span class="insert">actedOnBehalfOf(ag1,ag2,a,[prov:type="line-management"])</span>
 actedOnBehalfOf(ag2,ag3,a,[prov:type="contract"])
 </pre>
 </div>
@@ -2765,7 +2907,7 @@
 
 
 
-<div class="glossary-ref">   A <dfn id="concept-derivation">derivation</dfn>  is a transformation of an entity into another, a construction of an entity into another, or an update of an entity, resulting in a new one.</div>
+<div class="glossary-ref">   A <dfn id="concept-derivation">derivation</dfn>  is a transformation of an entity into another, <span class="delete">a</span><span class="insert">an update of an entity, resulting in a new one, or based on an entity, the</span> construction of <span class="delete">an entity into another, or an update of an entity, resulting in a new one.</span><span class="insert">another.</span></div>
 
 
 
@@ -2838,7 +2980,7 @@
 
 <div class="anexample" id="anexample-revision">
 <p>
-Revisiting the example of <a href="#section-example-two">Section 3.2</a>,
+Revisiting the example of <a href="#section-example-two">Section <span class="delete">3.2</span><span class="insert">4.2</span></a>,
 we can now state that the report 
  <span class="name">tr:WD-prov-dm-20111215</span> <span class="delete">is</span><span class="insert">was</span> a revision of 
  the report <span class="name">tr:WD-prov-dm-20111018<span class="delete">, approved by
@@ -2965,7 +3107,7 @@
 </p>
 
 <div class="anexample">
-<p>We refer to the example of <a href="#section-example-two">Section 3.1</a>, and specifically to <a href="#prov-a-document2">Figure 3</a>. We can see that there is a path from 
+<p>We refer to the example of <a href="#section-example-two">Section <span class="delete">3.1</span><span class="insert">4.1</span></a>, and specifically to <a href="#prov-a-document2">Figure 3</a>. We can see that there is a path from 
 <span class="name">tr:WD-prov-dm-20111215</span> to 
 <span class="name">w3:Consortium</span> and to
 <span class="name">process:rec-advance</span>. This is expressed as follows.
@@ -3258,33 +3400,25 @@
 
 </span><p></p><div class="glossary-ref"><span class="insert">   A </span><dfn id="concept-provenance-locator"><span class="insert">provenance locator</span></dfn><span class="insert"> is information that helps locate provenance descriptions.  It may identify a service, or may consist of a URI where provenance descriptions can be found. It can further identify a bundle within which provenance descriptions can be found.    </span></div>
 
-
-
-
-<div class="attributes" id="attributes-hasProvenanceIn"><span class="insert">
+<p>
+
+
+</p><div class="attributes" id="attributes-hasProvenanceIn"><span class="insert">
 A </span><dfn title="hasProvenanceIn" id="dfn-hasprovenancein"><span class="insert">provenance locator</span></dfn><span class="insert">,
 written
-</span><span class="pnExpression"><span class="insert">hasProvenanceIn(id, subject, bundle, target, service, prov, attrs)</span></span><span class="insert">, has:
+</span><span class="pnExpression"><span class="insert">hasProvenanceIn(id, subject, bundle, target, attrs)</span></span><span class="insert">, has:
 </span><ul>
 <li><span class="attribute" id="prov.locator.id"><span class="insert">id</span></span><span class="insert">: an identifier for a provenance locator; </span></li>
 <li><span class="attribute" id="prov.locator.subject"><span class="insert">subject</span></span><span class="insert">:  an identifier denoting something (entity, activity, agent, or relation instance);</span></li>
 <li><span class="attribute" id="prov.locator.bundle"><span class="insert">bundle</span></span><span class="insert">:  an </span><em class="rfc2119" title="optional"><span class="insert">optional</span></em><span class="insert"> identifier (</span><span class="name"><span class="insert">bundle</span></span><span class="insert">) for a bundle;
 </span></li><li><span class="attribute" id="prov.locator.target"><span class="insert">target</span></span><span class="insert">:  an </span><em class="rfc2119" title="optional"><span class="insert">optional</span></em><span class="insert"> identifier (</span><span class="name"><span class="insert">target</span></span><span class="insert">) denoting  something described in another set of descriptions (referred to as </span><a href="http://www.w3.org/TR/prov-aq/#dfn-target-uri"><span class="insert">Target-URI</span></a><span class="insert"> in [</span><cite><a class="bibref" rel="biblioentry" href="#bib-PROV-AQ"><span class="insert">PROV-AQ</span></a></cite><span class="insert">]);
-</span></li><li><span class="attribute" id="prov.locator.service"><span class="insert">service-uri</span></span><span class="insert">:  an </span><em class="rfc2119" title="optional"><span class="insert">optional</span></em><span class="insert"> URI (</span><span class="name"><span class="insert">service</span></span><span class="insert">) denoting a </span><a href="http://www.w3.org/TR/prov-aq/#dfn-provenance-service"><span class="insert">provenance service</span></a><span class="insert"> from which provenance can be retrieved (referred to as </span><a href="http://www.w3.org/TR/prov-aq/#dfn-service-uri"><span class="insert">Service-URI</span></a><span class="insert"> in [</span><cite><a class="bibref" rel="biblioentry" href="#bib-PROV-AQ"><span class="insert">PROV-AQ</span></a></cite><span class="insert">]);
-</span></li><li><span class="attribute" id="prov.locator.provenance"><span class="insert">provenance-uri</span></span><span class="insert">:  an </span><em class="rfc2119" title="optional"><span class="insert">optional</span></em><span class="insert"> URI (</span><span class="name"><span class="insert">prov</span></span><span class="insert">), which when dereferenced, allows access to provenance descriptions (referred to as </span><a href="http://www.w3.org/TR/prov-aq/#dfn-provenance-uri"><span class="insert">Provenance-URI</span></a><span class="insert"> in [</span><cite><a class="bibref" rel="biblioentry" href="#bib-PROV-AQ"><span class="insert">PROV-AQ</span></a></cite><span class="insert">]);
-</span></li><li><span class="attribute" id="prov.locator.attributes"><span class="insert">attributes</span></span><span class="insert">: an </span><em class="rfc2119" title="optional"><span class="insert">optional</span></em><span class="insert"> set (</span><span class="name"><span class="insert">attrs</span></span><span class="insert">) of attribute-value pairs representing additional information about this locator.</span></li>
+</span></li><li><span class="attribute" id="prov.locator.attributes"><span class="insert">attributes</span></span><span class="insert">: an </span><em class="rfc2119" title="optional"><span class="insert">optional</span></em><span class="insert"> set (</span><span class="name"><span class="insert">attrs</span></span><span class="insert">) of attribute-value pairs representing additional information about this locator; it optionally includes
+</span><a href="#term-attribute-service-uri"><span class="name"><span class="insert">prov:service-uri</span></span></a><span class="insert"> 
+or
+</span><a href="#term-attribute-provenance-uri"><span class="name"><span class="insert">prov:provenance-uri</span></span></a><span class="insert">.</span></li>
 </ul>
-<p><span class="insert">In </span><span class="pnExpression"><span class="insert">hasProvenanceIn(id, subject, bundle, target, service, prov, attrs)</span></span><span class="insert">, </span><span class="name"><span class="insert">service</span></span><span class="insert"> and </span><span class="name"><span class="insert">prov</span></span><span class="insert"> are both optional and mutually exclusive: if specified, either </span><span class="name"><span class="insert">service</span></span><span class="insert"> or </span><span class="name"><span class="insert">prov</span></span><span class="insert"> is provided.</span></p>
-</div>
-
-<p><span class="insert">A provenance locator specifies a context, referred to
-as </span><em><span class="insert">located context</span></em><span class="insert"> in which further descriptions can be found
-about something.</span></p>
-
-<div class="note"><span class="insert">
-It is suggested that prov:service-uri and prov:provenance-uri should be made optional reserved attributes.
-In the target is not specified, it is assumed that the target is the same identifier as subject.
-</span></div>
+<p><span class="insert">If the target is not specified, it is assumed that target is the same identifier as subject.
+</span></p></div>
 
 <p><span class="insert">When the subject and optional target denote entities,
 a provenance locator not only provides a located context, but it also expresses an </span><a href="#concept-alternate" class="internalDFN"><span class="insert">alternate</span></a><span class="insert"> relation between the entity denoted by </span><span class="name"><span class="insert">subject</span></span><span class="insert"> and the  entity described in the located context. This is a alternate since the entity denoted by </span><span class="name"><span class="insert">subject</span></span><span class="insert"> in the current context presents other aspects than the entity in the located one.</span></p>
@@ -3292,15 +3426,11 @@
 <div class="anexample" id="anexample-provenance-locator">
 <p><span class="insert">According to the following provenance locator, provenance descriptions about </span><span class="name"><span class="insert">ex:report1</span></span><span class="insert"> can be found in bundle </span><span class="name"><span class="insert">bob:bundle1</span></span><span class="insert">.</span></p>
 <pre class="codeexample"><span class="insert"> 
-hasProvenanceIn(ex:report1, bob:bundle1, -, -, -)
+hasProvenanceIn(ex:report1, bob:bundle1, -)
 </span></pre>
 <p><span class="insert">According to the following provenance locator, provenance descriptions about </span><span class="name"><span class="insert">ex:report1</span></span><span class="insert"> can be found in bundle </span><span class="name"><span class="insert">bob:bundle1</span></span><span class="insert">, which is available from the provenance service identified by the provided URI.</span></p>
 <pre class="codeexample"><span class="insert"> 
-hasProvenanceIn(ex:report1, bob:bundle1, -, "http://example.com/service"^xsd:anyURI, -)
-</span></pre>
-<p><span class="insert">According to the following provenance locator, provenance descriptions about </span><span class="name"><span class="insert">ex:report1</span></span><span class="insert"> can be found in resource identified by the provided URI.</span></p>
-<pre class="codeexample"><span class="insert"> 
-hasProvenanceIn(ex:report1, -, -, -, "http://example.com/some-provenance.pn"^xsd:anyURI)
+hasProvenanceIn(ex:report1, bob:bundle1, -, [ prov:service-uri="http://example.com/service"^xsd:anyURI ])
 </span></pre>
 </div>
 
@@ -3320,7 +3450,7 @@
 <pre class="codeexample"><span class="insert"> 
 bundle alice:bundle5
   entity(ex:report1)
-  hasProvenanceIn(ex:report1, bob:bundle4, -, -, -)
+  hasProvenanceIn(ex:report1, bob:bundle4, -)
   entity(ex:report2, [ prov:type="report", ex:version=2 ])
   wasGeneratedBy(ex:report2, -, 2012-05-25T11:00:01)
   wasDerivedFrom(ex:report2, ex:report1)
@@ -3338,7 +3468,7 @@
 <pre class="codeexample"><span class="insert"> 
 bundle alice:bundle6
   entity(alice:report1)
-  hasProvenanceIn(alice:report1, bob:bundle4, ex:report1, -, -)
+  hasProvenanceIn(alice:report1, bob:bundle4, ex:report1)
   entity(ex:report2, [ prov:type="report", ex:version=2 ])
   wasGeneratedBy(ex:report2, -, 2012-05-25T11:00:01)
   wasDerivedFrom(ex:report2, alice:report1)
@@ -3369,13 +3499,13 @@
   wasAttributedTo(tool:bundle8, viz:Visualizer)
 
   entity(ex:report1, [viz:color="orange"])
-  hasProvenanceIn(ex:report1, obs:bundle7, -, -, -)
+  hasProvenanceIn(ex:report1, obs:bundle7, -)
 
   entity(ex:report2, [viz:color="blue"])
-  hasProvenanceIn(ex:report2, obs:bundle7, -, -, -)
+  hasProvenanceIn(ex:report2, obs:bundle7, -)
 
   wasDerivedBy(ex:d; ex:report2, ex:report1, [viz:style="dotted"])
-  hasProvenanceIn(ex:d, obs:bundle7, -, -, -)
+  hasProvenanceIn(ex:d, obs:bundle7, -)
 endBundle
 </span></pre>
 
@@ -3845,14 +3975,18 @@
 
 
 <div id="attributes-at-a-glance-div" style="text-align: left;">
-<table border="1" style="margin-left: auto; margin-right: auto;">
-<caption id="attributes-at-a-glance">Table 5: PROV-DM Attributes At a Glance</caption>
-<tbody><tr><td><b>Attribute</b></td><td><b>value</b></td><td><b>Section</b></td></tr> 
-<tr><td>prov:label</td><td>xsd:string</td><td>Section <a href="#term-attribute-label">4.7.4.1</a> </td></tr>
-<tr><td>prov:location</td><td><a title="value" href="#dfn-value" class="internalDFN">Value</a></td><td>Section <a href="#term-attribute-location">4.7.4.2</a> </td></tr>
-<tr><td>prov:role</td><td><a title="value" href="#dfn-value" class="internalDFN">Value</a></td><td>Section <a href="#term-attribute-role">4.7.4.3</a> </td></tr>
-<tr><td>prov:type</td><td><a title="value" href="#dfn-value" class="internalDFN">Value</a></td><td>Section <a href="#term-attribute-type">4.7.4.4</a> </td></tr>
-<tr><td>prov:value</td><td><a title="value" href="#dfn-value" class="internalDFN">Value</a></td><td>Section <a href="#term-attribute-value">4.7.4.5</a> </td></tr>
+<table class="thinborder" style="margin-left: auto; margin-right: auto;">
+<caption id="attributes-at-a-glance">Table <span class="delete">5:</span><span class="insert">6:</span> PROV-DM Attributes At a Glance</caption>
+<tbody><tr><td><b>Attribute</b></td><td><b><span class="insert">Allowed In</span></b></td><td><b>value</b></td><td><b>Section</b></td></tr> 
+<tr><td style="border-width: 0px; "></td><td style="border-width: 0px; "></td><td style="border-width: 0px; "></td><td style="border-width: 0px; "></td></tr>
+<tr><td>prov:label</td><td><em><span class="insert">any construct</span></em></td><td><a href="http://www.w3.org/TR/xmlschema-2/#string">xsd:string</a></td><td>Section <a href="#term-attribute-label"><span class="delete">4.7.4.1</span><span class="insert">5.7.4.1</span></a> </td></tr>
+<tr><td>prov:location</td><td><a href="#concept-entity" class="internalDFN"><span class="insert">Entity</span></a><span class="insert">, </span><a href="#concept-activity" class="internalDFN"><span class="insert">Activity</span></a><span class="insert">, </span><br> <a href="#concept-usage" class="internalDFN"><span class="insert">Usage</span></a><span class="insert">, and </span><a href="#concept-generation" class="internalDFN"><span class="insert">Generation</span></a><span class="insert">.</span></td><td><a title="value" href="#dfn-value" class="internalDFN">Value</a></td><td>Section <a href="#term-attribute-location"><span class="delete">4.7.4.2</span><span class="insert">5.7.4.2</span></a> </td></tr>
+<tr><td>prov:role</td><td><a href="#concept-usage" class="internalDFN"><span class="insert">Usage</span></a><span class="insert">, </span><a href="#concept-generation" class="internalDFN"><span class="insert">Generation</span></a><span class="insert">, </span><br> <a href="#concept-association-core" class="internalDFN"><span class="insert">Association</span></a><span class="insert">, </span><a href="#concept-start" class="internalDFN"><span class="insert">Start</span></a><span class="insert">, and </span><a href="#concept-end" class="internalDFN"><span class="insert">End</span></a></td><td><a title="value" href="#dfn-value" class="internalDFN">Value</a></td><td>Section <a href="#term-attribute-role"><span class="delete">4.7.4.3</span><span class="insert">5.7.4.3</span></a> </td></tr>
+<tr><td>prov:type</td><td><em><span class="insert">any construct</span></em></td><td><a title="value" href="#dfn-value" class="internalDFN">Value</a></td><td>Section <a href="#term-attribute-type"><span class="delete">4.7.4.4</span><span class="insert">5.7.4.4</span></a> </td></tr>
+<tr><td>prov:value</td><td><a href="#concept-entity" class="internalDFN"><span class="insert">Entity</span></a></td><td><a title="value" href="#dfn-value" class="internalDFN">Value</a></td><td>Section <a href="#term-attribute-value"><span class="delete">4.7.4.5</span><span class="insert">5.7.4.5</span></a> </td></tr>
+
+<tr><td><span class="insert">prov:provenance-uri</span></td><td><a href="#concept-provenance-locator" class="internalDFN"><span class="insert">Provenance Locator</span></a></td><td><a href="http://www.w3.org/TR/xmlschema-2/#anyURI"><span class="insert">xsd:anyURI</span></a></td><td><span class="insert">Section </span><a href="#term-attribute-provenance-uri"><span class="insert">5.7.4.6</span></a> </td></tr>
+<tr><td><span class="insert">prov:service-uri</span></td><td><a href="#concept-provenance-locator" class="internalDFN"><span class="insert">Provenance Locator</span></a></td><td><a href="http://www.w3.org/TR/xmlschema-2/#anyURI"><span class="insert">xsd:anyURI</span></a></td><td><span class="insert">Section </span><a href="#term-attribute-service-uri"><span class="insert">5.7.4.7</span></a> </td></tr>
 </tbody></table>
 </div>
 
@@ -3894,6 +4028,10 @@
 </div>
 
 
+
+
+
+
 <div id="term-attribute-role" class="section">
 <h5><span class="secno"><span class="delete">4.7.4.3</span><span class="insert">5.7.4.3</span> </span>prov:role</h5>
 
@@ -3922,26 +4060,42 @@
 </div>
 
 <p>The following types are pre-defined in PROV, and are valid values for the <span class="name">prov:type</span> attribute.</p>
-<ul>
-<li><span class="name">prov:Plan
-
-<span class="delete">prov:Account</span></span></li>
-
-<li><span class="name">prov:SoftwareAgent</span></li>
-
-<li><span class="name">prov:Organization</span></li>
-
-<li><span class="name">prov:Person</span></li>
-
-<li><span class="name"><span class="insert">prov:Bundle</span></span></li>
-
-<li><span class="name">prov:Collection</span></li>
-
-<li><span class="name">prov:Dictionary</span></li>
-
-<li><span class="name">prov:EmptyDictionary</span></li>
-
-</ul>
+
+
+
+
+<table class="thinborder" style="margin-left: auto; margin-right: auto;">
+<caption id="prov-dm-predefined-types"><span class="insert">Table 7: PROV-DM Predefined Types</span></caption>
+<tbody><tr><td><b><span class="insert">Type</span></b></td><td><b><span class="insert">Specification</span></b></td><td><b><span class="insert">Core concept</span></b></td></tr>
+<tr><td style="border-width: 0px; "></td><td style="border-width: 0px; "></td><td style="border-width: 0px; "></td></tr>
+<tr><td><span class="name"><span class="insert">prov:Bundle</span></span></td><td><a title="bundle" href="#concept-bundle" class="internalDFN"><span class="insert">Section 5.5.1</span></a></td><td><a href="#concept-entity" class="internalDFN"><span class="insert">Entity</span></a></td></tr>
+<tr><td><span class="name"><span class="insert">prov:Collection</span></span></td><td><a title="collection" href="#concept-collection" class="internalDFN"><span class="insert">Section 5.6.1</span></a></td><td><a href="#concept-entity" class="internalDFN"><span class="insert">Entity</span></a></td></tr>
+<tr><td><span class="name"><span class="insert">prov:Dictionary</span></span></td><td><a title="dictionary" href="#concept-dictionary" class="internalDFN"><span class="insert">Section 5.6.2</span></a></td><td><a href="#concept-entity" class="internalDFN"><span class="insert">Entity</span></a></td></tr>
+<tr><td><span class="name"><span class="insert">prov:EmptyDictionary</span></span></td><td><a title="empty-dictionary"><span class="insert">Section 5.6.2</span></a></td><td><a href="#concept-entity" class="internalDFN"><span class="insert">Entity</span></a></td></tr>
+<tr><td><span class="name"><span class="insert">prov:HadOriginalSource</span></span></td><td><a title="original source" href="#concept-original-source" class="internalDFN"><span class="insert">Section 5.3.4</span></a></td><td><a href="#concept-derivation" class="internalDFN"><span class="insert">Derivation</span></a></td></tr>
+<tr><td><span class="name"><span class="insert">prov:Organization</span></span></td><td><a title="organization" href="#concept-organization" class="internalDFN"><span class="insert">Section 5.2.1</span></a></td><td><a href="#concept-agent" class="internalDFN"><span class="insert">Agent</span></a></td></tr>
+<tr><td><span class="name"><span class="insert">prov:Person</span></span></td><td><a title="person" href="#concept-person" class="internalDFN"><span class="insert">Section 5.2.1</span></a></td><td><a href="#concept-agent" class="internalDFN"><span class="insert">Agent</span></a></td></tr>
+<tr><td><span class="name">prov:Plan</span>
+
+<span class="delete">prov:Account</span>
+
+</td> <td><a title="plan" href="#concept-plan" class="internalDFN"><span class="insert">Section 5.2.3</span></a></td><td><a href="#concept-entity" class="internalDFN"><span class="insert">Entity</span></a></td></tr>
+<tr><td><span class="name">prov:SoftwareAgent</span>
+
+</td><td><a title="software-agent" href="#concept-software-agent" class="internalDFN"><span class="insert">Section 5.2.1</span></a></td><td><a href="#concept-agent" class="internalDFN"><span class="insert">Agent</span></a></td></tr>
+<tr><td><span class="name"><span class="delete">prov:Organization</span>
+
+<span class="insert">prov:WasQuotedFrom</span></span></td><td><a title="Quotation" href="#concept-quotation" class="internalDFN"><span class="insert">Section 5.3.3</span></a></td><td><a href="#concept-derivation" class="internalDFN"><span class="insert">Derivation</span></a></td></tr>
+<tr><td><span class="name"><span class="delete">prov:Person</span>
+
+<span class="delete">prov:Collection</span>
+
+<span class="delete">prov:Dictionary</span>
+
+<span class="delete">prov:EmptyDictionary</span>
+
+<span class="insert">prov:WasRevisionOf</span></span></td><td><a title="Revision" href="#concept-revision" class="internalDFN"><span class="insert">Section 5.3.2</span></a></td><td><a href="#concept-derivation" class="internalDFN"><span class="insert">Derivation</span></a></td></tr>
+</tbody></table>
 
 </div>
 
@@ -3978,6 +4132,57 @@
 
 
 
+
+
+<div id="term-attribute-provenance-uri" class="section">
+<h5><span class="secno"><span class="insert">5.7.4.6 </span></span><span class="insert">prov:provenance-uri</span></h5>
+
+
+<p><span class="insert"> The attribute </span><dfn title="dfn-provenance-uri" id="dfn-dfn-provenance-uri"><span class="name"><span class="insert">prov:provenance-uri</span></span></dfn><span class="insert"> provides
+  an </span><em class="rfc2119" title="optional"><span class="insert">optional</span></em><span class="insert"> IRI in the context of a </span><a href="#concept-provenance-locator" class="internalDFN"><span class="insert">Provenance Locator</span></a><span class="insert">;  when this IRI is dereferenced, it allows access to provenance descriptions. It is referred to as </span><a href="http://www.w3.org/TR/prov-aq/#dfn-provenance-uri"><span class="insert">Provenance-URI</span></a><span class="insert"> in [</span><cite><a class="bibref" rel="biblioentry" href="#bib-PROV-AQ"><span class="insert">PROV-AQ</span></a></cite><span class="insert">]. </span></p>
+
+
+<p><span class="insert">The attributes </span><a href="#term-attribute-service-uri"><span class="name"><span class="insert">prov:service-uri</span></span></a><span class="insert"> 
+and
+</span><a href="#term-attribute-provenance-uri"><span class="name"><span class="insert">prov:provenance-uri</span></span></a><span class="insert"> are mutually exclusive.</span></p>
+
+
+<div class="anexample" id="anexample-provenance-uri">
+<p><span class="insert">According to the following provenance locator, provenance descriptions about </span><span class="name"><span class="insert">ex:report1</span></span><span class="insert"> can be found in bundle </span><span class="name"><span class="insert">bob:bundle1</span></span><span class="insert">, which is available from the provenance service identified by the provided URI.</span></p>
+<pre class="codeexample"><span class="insert"> 
+hasProvenanceIn(ex:report1, bob:bundle1, -, [ prov:provenance-uri="http://example.com/service"^xsd:anyURI ])
+</span></pre>
+</div>
+
+
+
+</div>
+
+
+<div id="term-attribute-service-uri" class="section">
+<h5><span class="secno"><span class="insert">5.7.4.7 </span></span><span class="insert">prov:service-uri</span></h5>
+
+<p><span class="insert"> The attribute </span><dfn title="dfn-service-uri" id="dfn-dfn-service-uri"><span class="name"><span class="insert">prov:service-uri</span></span></dfn><span class="insert"> provides
+  an </span><em class="rfc2119" title="optional"><span class="insert">optional</span></em><span class="insert"> IRI in the context of a </span><a href="#concept-provenance-locator" class="internalDFN"><span class="insert">Provenance Locator</span></a><span class="insert">; this IRI denotes a </span><a href="http://www.w3.org/TR/prov-aq/#dfn-provenance-service"><span class="insert">provenance service</span></a><span class="insert"> from which provenance can be retrieved. It is referred to as </span><a href="http://www.w3.org/TR/prov-aq/#dfn-service-uri"><span class="insert">Service-URI</span></a><span class="insert"> in [</span><cite><a class="bibref" rel="biblioentry" href="#bib-PROV-AQ"><span class="insert">PROV-AQ</span></a></cite><span class="insert">].</span></p>
+
+
+<p><span class="insert">The attributes </span><a href="#term-attribute-service-uri"><span class="name"><span class="insert">prov:service-uri</span></span></a><span class="insert"> 
+and
+</span><a href="#term-attribute-provenance-uri"><span class="name"><span class="insert">prov:provenance-uri</span></span></a><span class="insert"> are mutually exclusive.</span></p>
+
+
+<div class="anexample" id="anexample-service-uri">
+<p><span class="insert">According to the following provenance locator, provenance descriptions about </span><span class="name"><span class="insert">ex:report1</span></span><span class="insert"> can be found in the resource identified by the provided URI.</span></p>
+<pre class="codeexample"><span class="insert"> 
+hasProvenanceIn(ex:report1, [ prov:service=uri="http://example.com/some-provenance.pn"^xsd:anyURI ])
+</span></pre>
+</div>
+
+</div>
+
+
+
+
 </div>
 
 <div id="term-value" class="section">
@@ -3997,11 +4202,11 @@
 
 
 
-<table border="1" style="margin-left: auto; margin-right: auto;">
-<caption id="prov-dm-data-types">Table 6: PROV-DM Data Types</caption>
+<table class="thinborder" style="margin-left: auto; margin-right: auto;">
+<caption id="prov-dm-data-types">Table <span class="delete">6:</span><span class="insert">8:</span> PROV-DM Data Types</caption>
 <tbody><tr><td><a href="http://www.w3.org/TR/xmlschema-2/#decimal">xsd:decimal</a></td> <td><a href="http://www.w3.org/TR/xmlschema-2/#double">xsd:double</a></td>  <td><a href="http://www.w3.org/TR/xmlschema-2/#dateTime">xsd:dateTime</a></td> </tr>
 <tr><td><a href="http://www.w3.org/TR/xmlschema-2/#integer">xsd:integer</a></td> <td><a href="http://www.w3.org/TR/xmlschema-2/#float">xsd:float</a></td><td><a href="http://www.w3.org/TR/2004/REC-rdf-concepts-20040210/#section-XMLLiteral"><span class="insert">rdf:XMLLiteral</span></a></td>  </tr>
-<tr><td><a href="http://www.w3.org/TR/xmlschema-2/#nonNegativeInteger">xsd:nonNegativeInteger</a></td> <td><a href="http://www.w3.org/TR/xmlschema-2/#string">xsd:string</a></td> <td><span class="delete">rdf:XMLLiteral</span><a href="http://www.w3.org/TR/prov-n/#prod-QUALNAME"><span class="insert">prov:QUALNAME</span></a></td> </tr>
+<tr><td><a href="http://www.w3.org/TR/xmlschema-2/#nonNegativeInteger">xsd:nonNegativeInteger</a></td> <td><a href="http://www.w3.org/TR/xmlschema-2/#string">xsd:string</a></td> <td><span class="delete">rdf:XMLLiteral</span><a href="http://www.w3.org/TR/prov-n/#prod-QUALIFIED_NAME"><span class="insert">prov:QUALIFIED_NAME</span></a></td> </tr>
 <tr><td><a href="http://www.w3.org/TR/xmlschema-2/#nonPositiveInteger">xsd:nonPositiveInteger</a></td><td><a href="http://www.w3.org/TR/xmlschema-2/#normalizedString">xsd:normalizedString</a></td> <td></td></tr>
 <tr><td><a href="http://www.w3.org/TR/xmlschema-2/#positiveInteger">xsd:positiveInteger</a></td> <td><a href="http://www.w3.org/TR/xmlschema-2/#token">xsd:token</a></td> <td></td></tr>
 <tr><td><a href="http://www.w3.org/TR/xmlschema-2/#negativeInteger">xsd:negativeInteger</a></td> <td><a href="http://www.w3.org/TR/xmlschema-2/#language">xsd:language</a></td> <td></td></tr>
@@ -4176,10 +4381,10 @@
 </dd><dt id="bib-PROV-AQ">[PROV-AQ]</dt><dd>Graham Klyne and Paul Groth (eds.) Luc Moreau, Olaf Hartig, Yogesh Simmhan, James Meyers, Timothy Lebo, Khalid Belhajjame, and Simon Miles <a href="http://www.w3.org/TR/prov-aq/"><cite>Provenance Access and Query</cite></a>. 2011, Working Draft. URL: <a href="http://www.w3.org/TR/prov-aq/">http://www.w3.org/TR/prov-aq/</a>
 </dd><dt id="bib-PROV-CONSTRAINTS">[PROV-CONSTRAINTS]</dt><dd>James Cheney, Paolo Missier, and Luc Moreau (eds.) <a href="http://www.w3.org/TR/prov-constraints/"><cite>Constraints of the PROV Data Model</cite></a>. 2011, Working Draft. URL: <a href="http://www.w3.org/TR/prov-constraints/">http://www.w3.org/TR/prov-constraints/</a>
 </dd><dt id="bib-PROV-N">[PROV-N]</dt><dd>Luc Moreau and Paolo Missier (eds.)<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>
-</dd><dt id="bib-PROV-O">[PROV-O]</dt><dd>Satya Sahoo and Deborah McGuinness (eds.) Khalid Belhajjame, James Cheney, Daniel Garijo, Timothy Lebo, Stian Soiland-Reyes, and Stephan Zednik <a href="http://www.w3.org/TR/prov-o/"><cite>Provenance Formal Model</cite></a>. 2011, Working Draft. URL: <a href="http://www.w3.org/TR/prov-o/">http://www.w3.org/TR/prov-o/</a>
-</dd><dt id="bib-PROV-PRIMER">[PROV-PRIMER]</dt><dd>Yolanda Gil and Simon Miles (eds.) Khalid Belhajjame, Helena Deus, Daniel Garijo, Graham Klyne, Paolo Missier, Stian Soiland-Reyes, and Stephan Zednik <a href="http://www.w3.org/TR/prov-primer/"><cite>Prov Model Primer</cite></a>. 2011, Working Draft. URL: <a href="http://www.w3.org/TR/prov-primer/">http://www.w3.org/TR/prov-primer/</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></dl></div></div></body></html>
-
-
-
+</dd><span class="delete">[PROV-O]</span><span class="delete">Satya Sahoo and Deborah McGuinness (eds.) Khalid Belhajjame, James Cheney, Daniel Garijo, Timothy Lebo, Stian Soiland-Reyes, and Stephan Zednik </span><span class="delete">Provenance Formal Model</span><span class="delete">. 2011, Working Draft. URL: </span><span class="delete">http://www.w3.org/TR/prov-o/</span>
+<span class="delete">[PROV-PRIMER]</span><span class="delete">Yolanda Gil and Simon Miles (eds.) Khalid Belhajjame, Helena Deus, Daniel Garijo, Graham Klyne, Paolo Missier, Stian Soiland-Reyes, and Stephan Zednik </span><span class="delete">Prov Model Primer</span><span class="delete">. 2011, Working Draft. URL: </span><span class="delete">http://www.w3.org/TR/prov-primer/</span>
+<span class="delete">[PROV-SEM]</span><span class="delete">James Cheney </span><span class="delete">Formal Semantics Strawman</span><span class="delete">. 2011, Work in progress. URL: </span><span class="delete">http://www.w3.org/2011/prov/wiki/FormalSemanticsStrawman</span>
+</dl></div></div></body></html>
+
+
+
--- a/model/glossary.html	Thu May 24 21:48:41 2012 -0400
+++ b/model/glossary.html	Thu May 24 21:51:11 2012 -0400
@@ -26,7 +26,7 @@
 </span>
 
 <span class="glossary" id="glossary-derivation">  
-A <dfn id="concept-derivation">derivation</dfn>  is a transformation of an entity into another, a construction of an entity into another, or an update of an entity, resulting in a new one.</span>
+A <dfn id="concept-derivation">derivation</dfn>  is a transformation of an entity into another, an update of an entity, resulting in a new one, or based on an entity, the construction of another.</span>
 
 
 
@@ -66,6 +66,12 @@
 for the actions of a "subordinate" agent, in the context of an activity. 
 </span>
 
+<span class="glossary" id="glossary-delegation">  
+<dfn id="concept-delegation">Delegation</dfn> is the assignment of authority to an agent
+(by itself or by another agent)
+ to carry out a specific activity as a delegate or representative, while the agent that it represents remains responsible for the outcome of the delegated work.
+</span>
+
 <!--A <dfn title="concept-responsibility">responsibility chain</dfn> is a relation between two agents,
 indicating that a "subordinate" agent acted on behalf of a "responsible" agent, in the context of an activity. 
 
--- a/model/glossary.js	Thu May 24 21:48:41 2012 -0400
+++ b/model/glossary.js	Thu May 24 21:51:11 2012 -0400
@@ -3,7 +3,7 @@
 //  with <script src="glossary.js" class="remove"></script>
 //Insert glossary definitions with the following 
 // <div class="glossary-ref" ref="glossary-generation"></div>
-glossary_hg='http://dvcs.w3.org/hg/prov/file/850bd03c3161/model/glossary.html';
+glossary_hg='http://dvcs.w3.org/hg/prov/file/5900bd8af80d/model/glossary.html';
 glossary_string= 
 ' ' + 
 '<html> ' + 
@@ -33,7 +33,7 @@
 '</span> ' + 
 ' ' + 
 '<span class="glossary" id="glossary-derivation">   ' + 
-'A <dfn id="concept-derivation">derivation</dfn>  is a transformation of an entity into another, a construction of an entity into another, or an update of an entity, resulting in a new one.</span> ' + 
+'A <dfn id="concept-derivation">derivation</dfn>  is a transformation of an entity into another, an update of an entity, resulting in a new one, or based on an entity, the construction of another.</span> ' + 
 ' ' + 
 ' ' + 
 ' ' + 
@@ -73,6 +73,12 @@
 'for the actions of a "subordinate" agent, in the context of an activity.  ' + 
 '</span> ' + 
 ' ' + 
+'<span class="glossary" id="glossary-delegation">   ' + 
+'<dfn id="concept-delegation">Delegation</dfn> is the assignment of authority to an agent ' + 
+'(by itself or by another agent) ' + 
+' to carry out a specific activity as a delegate or representative, while the agent that it represents remains responsible for the outcome of the delegated work. ' + 
+'</span> ' + 
+' ' + 
 '<!--A <dfn title="concept-responsibility">responsibility chain</dfn> is a relation between two agents, ' + 
 'indicating that a "subordinate" agent acted on behalf of a "responsible" agent, in the context of an activity.  ' + 
 ' ' + 
@@ -204,7 +210,7 @@
 ' ' + 
 ' ' + 
 '<span class="glossary" id="glossary-organization">   ' + 
-'Agents of type <dfn id="concept-organization" title="organization">Organization</dfn>  are social or legal institutions such as companies, societies, etc. ' + 
+'Agents of type <dfn id="concept-organization">Organization</dfn>  are social or legal institutions such as companies, societies, etc. ' + 
 '</span> ' + 
 ' ' + 
 ' ' + 
--- a/model/grammar/ll.html	Thu May 24 21:48:41 2012 -0400
+++ b/model/grammar/ll.html	Thu May 24 21:51:11 2012 -0400
@@ -106,7 +106,7 @@
 <td><a id="prod-prov_n_LL-usageExpression" name="prod-prov_n_LL-usageExpression"></a>[<span class="prodNo">12</span>]&nbsp;&nbsp;&nbsp;</td>
 <td><code class="production prod">usageExpression</code></td>
 <td>&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</td>
-<td><code class="content">"used" "(" <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-optionalIdentifier">optionalIdentifier</a></span> <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-aIdentifier">aIdentifier</a></span> "," <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-eIdentifier">eIdentifier</a></span> (( "," <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-timeOrMarker">timeOrMarker</a></span> ))? <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-optionalAttributeValuePairs">optionalAttributeValuePairs</a></span> ")"</code></td>
+<td><code class="content">"used" "(" <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-optionalIdentifier">optionalIdentifier</a></span> <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-aIdentifier">aIdentifier</a></span> "," (( "," <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-eIdentifierOrMarker">eIdentifierOrMarker</a></span> "," <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-timeOrMarker">timeOrMarker</a></span> ))? <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-optionalAttributeValuePairs">optionalAttributeValuePairs</a></span> ")"</code></td>
 </tr>
 </tbody>
 
--- a/model/grammar/ll.js	Thu May 24 21:48:41 2012 -0400
+++ b/model/grammar/ll.js	Thu May 24 21:51:11 2012 -0400
@@ -107,7 +107,7 @@
 '<td><a id="prod-usageExpression" name="prod-usageExpression"></a>[<span class="prodNo">12</span>]&nbsp;&nbsp;&nbsp;</td> ' + 
 '<td><code class="production prod">usageExpression</code></td> ' + 
 '<td>&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</td> ' + 
-'<td><code class="content">"used" "(" <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-eIdentifier">eIdentifier</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> ' + 
+'<td><code class="content">"used" "(" <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-timeOrMarker">timeOrMarker</a></span> )? <span class="prod"><a class="grammarRef" href="#prod-optionalAttributeValuePairs">optionalAttributeValuePairs</a></span> ")"</code></td> ' + 
 '</tr> ' + 
 '</tbody> ' + 
 ' ' + 
--- a/model/grammar/yack/prov-n-LL.bnf	Thu May 24 21:48:41 2012 -0400
+++ b/model/grammar/yack/prov-n-LL.bnf	Thu May 24 21:51:11 2012 -0400
@@ -36,7 +36,7 @@
 [11] identifierOrMarker::=(identifier | "-")
 
 
-[12] usageExpression::=	"used" "(" optionalIdentifier  aIdentifier "," eIdentifier ("," timeOrMarker)? optionalAttributeValuePairs ")"
+[12] usageExpression::=	"used" "(" optionalIdentifier  aIdentifier "," ("," eIdentifierOrMarker "," timeOrMarker)? optionalAttributeValuePairs ")"
 
 [13] startExpression::=	"wasStartedBy" "(" optionalIdentifier aIdentifier ("," eIdentifierOrMarker "," aIdentifierOrMarker "," timeOrMarker)? optionalAttributeValuePairs ")"
 
--- a/model/grammar/yack/prov-n-LL.bnf.html	Thu May 24 21:48:41 2012 -0400
+++ b/model/grammar/yack/prov-n-LL.bnf.html	Thu May 24 21:51:11 2012 -0400
@@ -105,7 +105,7 @@
 <td><a id="prod-prov_n_LL-usageExpression" name="prod-prov_n_LL-usageExpression"></a>[<span class="prodNo">12</span>]&nbsp;&nbsp;&nbsp;</td>
 <td><code class="production prod">usageExpression</code></td>
 <td>&nbsp;&nbsp;&nbsp;::=&nbsp;&nbsp;&nbsp;</td>
-<td><code class="content">"used" "(" <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-optionalIdentifier">optionalIdentifier</a></span> <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-aIdentifier">aIdentifier</a></span> "," <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-eIdentifier">eIdentifier</a></span> (( "," <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-timeOrMarker">timeOrMarker</a></span> ))? <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-optionalAttributeValuePairs">optionalAttributeValuePairs</a></span> ")"</code></td>
+<td><code class="content">"used" "(" <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-optionalIdentifier">optionalIdentifier</a></span> <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-aIdentifier">aIdentifier</a></span> "," (( "," <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-eIdentifierOrMarker">eIdentifierOrMarker</a></span> "," <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-timeOrMarker">timeOrMarker</a></span> ))? <span class="prod"><a class="grammarRef" href="#prod-prov_n_LL-optionalAttributeValuePairs">optionalAttributeValuePairs</a></span> ")"</code></td>
 </tr>
 </tbody>
 
--- a/model/prov-dm.html	Thu May 24 21:48:41 2012 -0400
+++ b/model/prov-dm.html	Thu May 24 21:51:11 2012 -0400
@@ -30,7 +30,7 @@
 }
 table.thinborder td {
 	border-width: 1px;
-	padding: 0px;
+	padding: 2px;
 	border-style: solid;
 	border-color: gray;
 	-moz-border-radius: ;
@@ -204,7 +204,7 @@
           wgURI:        "http://www.w3.org/2011/prov/",
           
           // name (with the @w3c.org) of the public mailing to which comments are due
-          wgPublicList: "public-prov-wg",
+          wgPublicList: "public-prov-comments",
           
           // URI of the patent status for this WG, for Rec-track documents
           // !!!! IMPORTANT !!!!
@@ -222,7 +222,7 @@
 
     <section id="abstract">
 <p>
-PROV-DM, the PROV data model, is a data model for provenance that describes
+PROV-DM, the PROV conceptual data model, is a data model for provenance that describes
 the entities, people and activities involved in
 producing a piece of data or thing. 
 PROV-DM distinguishes core structures, forming the essence of provenance descriptions, from
@@ -232,7 +232,7 @@
 (2) agents bearing responsibility for entities that were generated and activities that happened;
 (3) derivations of entities from entities;
 (4) properties to link entities that refer to the same thing;
-(5) notion of bundle, a mechanism to support provenance of provenance;
+(5) a notion of bundle, a mechanism to support provenance of provenance; and,
 (6) collections forming a logical structure for its members.
 </p>
 
@@ -251,6 +251,15 @@
     </section> 
 
 <section id="sotd">
+<h4>Intended to be Last Call (TBC)</h4>
+<p>This is the fifth public release of the PROV-DM document. 
+Publication as Last Call working draft means that 
+the Working Group believes that it has satisfied the relevant technical requirements outlined in its charter on this document. The design is not expected to change significantly, going forward, and now is the key time for external review, before the implementation phase.</p>
+<h4>Please Comment By (date TBD)</h4>
+<p>The PROV Working group seeks public feedback on this Working Draft.
+The end date of the Last Call review period is TBD, and we would appreciate comments by that date to public-prov-comments@w3.org
+</p>
+
 <h4>PROV Family of Specifications</h4>
 This document is part of the PROV family of specifications, a set of specifications defining various aspects that are necessary to achieve the vision of inter-operable
 interchange of provenance information in heterogeneous environments such as the Web.  The specifications are:
@@ -273,10 +282,6 @@
 <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>
 </ul>
-
-
-<h4>Fourth Public Working Draft</h4>
-<p>This is the fourth public release of the PROV-DM document. Following feedback, the Working Group has decided to reorganize this document substantially, separating the data model from its contraints and the notation used to illustrate it. The PROV-DM release is synchronized with the release of the PROV-O, PROV-PRIMER, PROV-N, and PROV-CONSTRAINTS documents. We are now clarifying the entry path to the PROV family of specifications.</p>
 </section>
 
 
@@ -316,19 +321,20 @@
 
 <p>
 We
-consider a core data model for provenance that allows  domain and application specific representations of provenance to be translated into such a data model and  <em>interchanged</em> between systems.
-Thus, heterogeneous systems can export their native provenance into such a core data model, and applications that need to make sense of provenance in heterogeneous systems can then import it,
+consider a generic data model for provenance that allows  domain and application specific representations of provenance to be translated into such a data model and  <em>interchanged</em> between systems.
+Thus, heterogeneous systems can export their native provenance into such a core data model, and applications that need to make sense of provenance can then import it,
 process it, and reason over it.</p>
 
+<!--
 <p>A set of specifications, referred to as the PROV family of specifications, define the various aspects
 that are necessary to achieve this vision in an interoperable
 way:</p>
 <ul>
 <li>A data model for provenance, which is presented in three documents:
 <ul>
-<li> PROV-DM (part I): the provenance data model, informally described (this document);
-<li> PROV-CONSTRAINTS (part II): constraints underpinning the data model [[PROV-CONSTRAINTS]];
-<li> PROV-N (part III): a notation to express instances of that data model for human consumption [[PROV-N]];
+<li> PROV-DM: the provenance data model, informally described (this document);
+<li> PROV-CONSTRAINTS: constraints underpinning the data model [[PROV-CONSTRAINTS]];
+<li> PROV-N: a notation to express instances of that data model for human consumption [[PROV-N]];
 </ul> 
 </li>
 <li>PROV-O: the PROV ontology, an OWL-RL ontology allowing the mapping of PROV to RDF [[PROV-O]];</li>
@@ -337,12 +343,23 @@
 <li>PROV-SEM: semantics of the PROV-DM data model [[PROV-SEM]];</li>
 <li>PROV-XML: an XML schema for the PROV data model.</li>
 </ul>
+-->
 
 
 <p>
-The  PROV data model is a domain-agnostic model, but with clear extensibility points allowing further domain-specific and
+The PROV data model distinguishes <em>core structures</em> from
+<em>extended structures</em>: core structures form the essence of
+provenance descriptions, and are commonly found in various
+domain-specific vocabularies. Extended structures enhance and refine core
+structures with more expressive capabilities to cater for more
+advanced uses of provenance.
+The  PROV data model, comprising both core and extended structures, is a domain-agnostic model, but with clear extensibility points allowing further domain-specific and
 application-specific extensions to be defined.
-The PROV data model is structured according to six components covering various aspects of provenance:</p>
+</p>
+
+
+<p>
+The PROV data model has a modular design and is structured according to six components covering various facets of provenance:</p>
 <ul>
 <li> component 1: entities and activities, and the time at which they were created, used, or ended;
 <li> component 2: agents bearing responsibility for entities that were generated and activities that happened;
@@ -353,19 +370,19 @@
 </ul>
 
 
-<p>This specification presents the key concepts of the PROV Data Model, and
+<p>This specification presents the concepts of the PROV Data Model, and
 provenance types and relations, without specific concern for how they are applied.
 With these, it becomes possible to write useful provenance descriptions, and publish or embed them alongside the data they relate to. </p>
 
 <p>However, if something about which provenance is expressed is subject to change, then it is challenging to express its provenance precisely (e.g. the data from which a daily weather report is derived  changes from day to day).
- To address this challenge, a <em>refinement</em> is proposed to enrich simple provenance, with extra descriptions that  help qualify the specific subject of provenance and provenance itself, with attributes and temporal information, intended to satisfy a comprehensive set of constraints.  These aspects are covered in the companion specification [[PROV-CONSTRAINTS]].
+ To address this challenge, it is proposed to enrich simple provenance, with refined descriptions that  help qualify the specific subject of provenance and provenance itself, with attributes and temporal information, intended to satisfy a comprehensive set of constraints.  These aspects are covered in the companion specification [[PROV-CONSTRAINTS]].
 </p>
 
 
 <section id="structure-of-this-document"> 
 <h3>Structure of this Document</h3>
 
-<p><a href="#section-prov-overview">Section 2</a> provides an overview of the PROV Data Model,  distinguishing a CORE set of types and  relations, commonly found in provenance descriptions, from extended structures catering for advanced uses.</p>
+<p><a href="#section-prov-overview">Section 2</a> provides an overview of the PROV Data Model,  distinguishing a core set of types and  relations, commonly found in provenance descriptions, from extended structures catering for advanced uses. It also introduces a modular organization of the data model in components. </p>
 
 <p><a href="#prov-notation">Section 3</a> overviews the Provenance Notation used to illustrate examples of provenance descriptions.</p>
 
@@ -380,7 +397,7 @@
 
 <p><a href="#extensibility-section">Section 6</a> summarizes PROV-DM extensibility points.</p>
 
-<p><a href="#valid-provenance">Section 7</a> introduces the idea that constraints can be applied to the PROV data model to refine provenance descriptions; these are covered in the companion specification [[PROV-CONSTRAINTS]].</p>
+<p><a href="#valid-provenance">Section 7</a> introduces the idea that constraints can be applied to the PROV data model to validate provenance descriptions; these are covered in the companion specification [[PROV-CONSTRAINTS]].</p>
 
 
 </section> 
@@ -403,7 +420,7 @@
 <table  class="thinborder" style="margin-left: auto; margin-right: auto;">
 <caption id="namespace-table">Table 1: Prefix and Namespaces used in this specification</caption>
 <tr><td><a><b>prefix</b></a></td><td><b>namespace uri</b></td> <td><b>definition</b></td></tr>
-<tr><td><a>prov</a></td><td>http://www.w3.org/ns/prov#</td><td>The PROV namespace (see Section <a href="#term-NamespaceDeclaration">4.7.1</a>)</td></tr>
+<tr><td><a>prov</a></td><td>http://www.w3.org/ns/prov#</td><td>The PROV namespace (see Section <a href="#term-NamespaceDeclaration">5.7.1</a>)</td></tr>
 <tr><td><a>xsd</a></td><td>http://www.w3.org/2000/10/XMLSchema#</td><td>XML Schema Namespace [[!XMLSCHEMA-2]]</td></tr>
 <tr><td><a>rdf</a></td><td>http://www.w3.org/1999/02/22-rdf-syntax-ns#</td><td>The RDF namespace  [[!RDF-CONCEPTS]]</td></tr>
 <tr><td><a>(others)</a></td><td>(various)</td><td>All other namespace prefixes are used in examples only. <br/> In particular, URIs starting with "http://example.com" represent<br/> some application-dependent URI [[!URI]]</td></tr>
@@ -412,7 +429,7 @@
 
 <p> 
   Examples throughout this document use the PROV-N Provenance
-  Notation, briefly introduced in <a href="#prov-notation">Section 3</a> and specified fully in separate document [[PROV-N]].</p>
+  Notation, briefly introduced in <a href="#prov-notation">Section 3</a> and specified fully in a separate document [[PROV-N]].</p>
 
 
 </section> 
@@ -425,7 +442,7 @@
 <h1>PROV Overview</h1>
 
 <p>This section introduces provenance concepts with informal descriptions and illustrative
-examples. PROV distinguishes  <em>core structures</em>, forming the essence of  provenance descriptions, from <em>extended structures</em> catering for more advanced uses of provenance.  Core and extended structures are respectively presented in <a href="#core-structures">Section 2.1</a> and <a href="#section-extended-structures">Section 2.2</a>. Furthermore, the PROV data model is organized according to components, which are thematic groupings of concepts, overviewed in <a href="#section-overview-components">Section 2.3</a>.
+examples. PROV distinguishes  <em>core structures</em>, forming the essence of  provenance descriptions, from <em>extended structures</em> catering for more advanced uses of provenance.  Core and extended structures are respectively presented in <a href="#core-structures">Section 2.1</a> and <a href="#section-extended-structures">Section 2.2</a>. Furthermore, the PROV data model is organized according to components, which form thematic groupings of concepts (see <a href="#section-overview-components">Section 2.3</a>).
 </p>
 
 
@@ -435,7 +452,7 @@
 <p>The core of PROV consists of essential provenance structures commonly found in provenance descriptions.
 It is summarized graphically by
 the UML diagram of <a href="#prov-core-structures">Figure 1</a>,
-illustrating  three types (entity, activity, and agent) and how they relate to each other.  In the core of PROV, all relations are binary. </p>
+illustrating  three types (entity, activity, and agent) and how they relate to each other.  In the core of PROV, all associations are binary. </p>
 
 
 <div style="text-align: center; ">
@@ -446,9 +463,9 @@
   </figure>
 </div>
 
-<p>The rest of this section introduces the concepts found in PROV Core structures.
-They are summarized in  <a href="#overview-types-and-relations">Table 2</a>, where they are grouped according to
-the types and relations the PROV conceptual data model. 
+<p>The concepts found in the core of PROV are introduced in the rest of this section.
+They are summarized in  <a href="#overview-types-and-relations">Table 2</a>, where they are categorized as
+ type or relation.
  The first column lists concepts, the second column indicates whether a concept maps to a type or a relation, whereas the third column contains the corresponding name.    Names of relations have a verbal form in the past tense to express what happened in the past, as opposed to what may or will happen. 
 </p>
 
@@ -464,13 +481,14 @@
 <tr>
 <td><a>Entity</a></td><td rowspan="3" style="text-align: center;">PROV-DM Types</td><td><a title="dfn-Entity">entity</a></td><td style="text-align: center;"><a href="#section-entity-activity">2.1.1</a></td></tr>
 <tr><td><a>Activity</a></td><td><a title="dfn-Activity">activity</a></td><td style="text-align: center;"><a href="#section-entity-activity">2.1.1</a></td></tr>
-<tr><td><a>Agent</a></td><td><a title="dfn-agent">agent</a></td><td style="text-align: center;"><a href="#section-agents-attribution-association-responsibility">2.1.2</a></td></tr>
+<tr><td><a>Agent</a></td><td><a title="dfn-agent">agent</a></td><td style="text-align: center;"><a href="#section-agents-attribution-association-delegation">2.1.2</a></td></tr>
 <tr>
-<td><a>Generation</a></td><td rowspan="6" style="text-align: center;">PROV-DM Relations</td><td><a title="wasGeneratedBy">wasGeneratedBy</a></td><td style="text-align: center;"><a href="#section-entity-activity">2.1.1</a></td></tr>
+<td><a>Generation</a></td><td rowspan="7" style="text-align: center;">PROV-DM Relations</td><td><a title="wasGeneratedBy">wasGeneratedBy</a></td><td style="text-align: center;"><a href="#section-entity-activity">2.1.1</a></td></tr>
 <tr><td><a>Usage</a></td><td><a title="used">used</a></td><td style="text-align: center;"><a href="#section-entity-activity">2.1.1</a></td></tr>
-<tr><td><a>Attribution</a></td><td><a title="wasAttributedTo">wasAttributedTo</a></td><td style="text-align: center;"><a href="#section-agents-attribution-association-responsibility">2.1.2</a></td></tr>
-<tr><td><a>Association</a></td><td><a title="wasAssociatedWith">wasAssociatedWith</a></td><td style="text-align: center;"><a href="#section-agents-attribution-association-responsibility">2.1.2</a></td></tr>
-<tr><td><a>Responsibility</a></td><td><a title="actedOnBehalfOf">actedOnBehalfOf</a></td><td style="text-align: center;"><a href="#section-agents-attribution-association-responsibility">2.1.2</a></td></tr>
+<tr><td><a>Communication</a></td><td><a title="wasInformedBy">wasInformedBy</a></td><td style="text-align: center;"><a href="#section-entity-activity">2.1.1</a></td></tr>
+<tr><td><a>Attribution</a></td><td><a title="wasAttributedTo">wasAttributedTo</a></td><td style="text-align: center;"><a href="#section-agents-attribution-association-delegation">2.1.2</a></td></tr>
+<tr><td><a>Association</a></td><td><a title="wasAssociatedWith">wasAssociatedWith</a></td><td style="text-align: center;"><a href="#section-agents-attribution-association-delegation">2.1.2</a></td></tr>
+<tr><td><a>Responsibility</a></td><td><a title="actedOnBehalfOf">actedOnBehalfOf</a></td><td style="text-align: center;"><a href="#section-agents-attribution-association-delegation">2.1.2</a></td></tr>
 <tr><td><a>Derivation</a></td><td><a title="wasDerivedFrom">wasDerivedFrom</a></td><td style="text-align: center;"><a href="#section-derivation">2.1.3</a></td></tr>
 </table>
 </div>
@@ -533,7 +551,7 @@
 </div>
 
 <p>Activities and entities are associated with each other in two different ways: activities utilize entities and activities  produce entities. The act of utilizing or producing an entity may have a duration.  
- The term 'generation' refers to the completion of the act of producing; likewise, the term 'usage' refers to the beginning of the act of utilizing entities. Thus, we define the following notions of generation and usage. </p>
+ The term 'generation' refers to the completion of the act of producing; likewise, the term 'usage' refers to the beginning of the act of utilizing entities. Thus, we define the following concepts of generation and usage. </p>
 
 <p>
 <div class="glossary-ref" data-ref="glossary-generation"  data-withspan="true">
@@ -561,11 +579,23 @@
 the mix); in contrast, the same entity may be used multiple times, possibly by different activities (e.g. a file on a file system can be read indefinitely).
 </div>
 
+<p>
+<div class="glossary-ref" data-ref="glossary-communication"  data-withspan="true">
+</div>
+
+
+
+
+<div class="conceptexample" id="communication-example">
+<p>An example of commication is ...
+</div>
+
+
 
 </section>
 
 
-<section id="section-agents-attribution-association-responsibility"> 
+<section id="section-agents-attribution-association-delegation"> 
 <h2>Agents and Responsibility</h2>
 
 <p>The motivation for introducing  agents in the model is to express the agent's responsibility for activities that happened and entities that were generated. </p>
@@ -587,7 +617,7 @@
 
 <div class="conceptexample" id="agent-example">
 <p>
-Software for checking the use of grammar in a document may be defined as an agent of a document preparation activity, and at the same time one can describe its provenance, including for instance the vendor and the version history. 
+Software for checking the use of grammar in a document may be defined as an agent of a document preparation activity;  one can also describe its provenance, including for instance the vendor and the version history. 
 A site selling books on the Web, the services involved in the processing of orders, and the companies hosting them are also agents.
 </p>
 </div>
@@ -622,16 +652,11 @@
 </ul>
 </div>
 
+
+
 <p>
-<span class="glossary-ref" data-ref="glossary-responsibility"  data-withspan="true">
-</span> The nature of this relation is intended to be broad,  including delegation or contractual relation. </p>
-
-<!--<div class="note">Propose to rephrase as follows: <br/>
-A relation between two agents, denoted <dfn title="concept-responsibilityChain">actedOnBehalfOf</dfn> indicates that 
- that a "subordinate" agent acted on behalf of a "responsible" agent, in the context of an activity.  The nature of this relation is intended to be broad,  including delegation or a contractual relation.
-  When this relation is used transitively, i.e., one agent acts on behalf of another, who also acts on behalf of another, etc., these relations form a  <dfn title="concept-responsibilityChain">responsibility chain</dfn>.
-</div>-->
-  
+<span class="glossary-ref" data-ref="glossary-delegation"  data-withspan="true">
+</span> The nature of this relation is intended to be broad,  including contractual relation, but also altruistic initiative by the representative agent. </p>
 
 
 
@@ -651,7 +676,7 @@
 
 
 
-<p>Activities utilize entities and produce entities. In some cases, utilizing an entity influences the creation of another in some way. This notion is captured by derivations, defined as follows.</p>
+<p>Activities utilize entities and produce entities. In some cases, utilizing an entity influences the creation of another in some way. This notion of 'influence' is captured by derivations, defined as follows.</p>
 
 <p>
 <span class="glossary-ref" data-ref="glossary-derivation"  data-withspan="true"></span>
@@ -672,7 +697,7 @@
 
 <p>While the core of PROV focuses on essential provenance structures commonly found in provenance descriptions, extended structures 
 are designed to support more advanced uses of provenance. 
-The purpose of this section is twofold. First, mechanisms to specify these extended structures are introduced.  Second,  two further categories of provenance structures are overviewed: they cater for provenance of provenance and collections,  respectively.</p>
+The purpose of this section is twofold. First, mechanisms to specify these extended structures are introduced.  Second,  two further kinds of provenance structures are overviewed: they cater for provenance of provenance and collections,  respectively.</p>
 
 
 
@@ -704,12 +729,12 @@
 <section id="section-prov-extended-approach-expanded-relation"> 
 <h2>Expanded Relations</h2>
 
-<p><a href="#core-structures">Section 2.1</a> shows that six concepts are mapped to binary relations in the core of PROV.  However, some advanced uses of these concepts cannot be captured by a binary relation, but require relations to be expanded to n-ary relations.</p>
+<p><a href="#core-structures">Section 2.1</a> shows that seven concepts are mapped to binary relations in the core of PROV.  However, some advanced uses of these concepts cannot be captured by a binary relation, but require relations to be expanded to n-ary relations.</p>
 
 
 <p>To illustrate expanded relations, we consider the concept of
 association, described
-in <a href="#section-agents-attribution-association-responsibility">section
+in <a href="#section-agents-attribution-association-delegation">section
 2.1.2</a>.  Agents may adopt sets of actions or steps to achieve their
 goals in the context of an activity: this is captured by the notion of
 a plan.  Thus, an activity may reflect the execution of a plan that was
@@ -736,7 +761,7 @@
 
 <div class="conceptexample" id="association-example2">
 <p>An example of association between an activity and an agent involving a plan is:
-an XSLT transform launched by a user based on an XSL style sheet (a plan).
+an XSLT transform (an activity) launched by a user (an agent) based on an XSL style sheet (a plan).
 
 </div>
 </section>
@@ -748,10 +773,9 @@
 <p>Some concepts exhibit both a core use, expressed as
 binary relation, and an extended use, expressed as n-ary relation.  In
 some cases, mapping the concept to a relation, whether binary or
-n-ary, is not sufficient: instead, it may be required to able to
-identify an instance of such concept.</p>
-
-<p>In such circumstances, PROV-DM allows an optional identifier to be
+n-ary, is not sufficient: instead, it may be required to
+identify an instance of such concept.  In those cases, PROV-DM allows for 
+an optional identifier to be
 expressed to identify an instance of an association between two or
 more elements.  This optional identifier can then be used to refer to
 an instance as part of other concepts.</p>
@@ -823,14 +847,15 @@
 is further organized according to components, grouping concepts in a
 thematic manner. </p>
 
-<p> <a href="#components-overview">Table 3</a> enumerates the six components, five of which have already been implicitly overviewed in this section. All components offer extended structures, whereas the first three only offer core structures.
+<p> <a href="#components-overview">Table 3</a> enumerates the six components, five of which have already been implicitly overviewed in this section. All components specify extended structures, whereas only the first three  define core structures.
 
 <div id="components-overview-div" style="text-align: center;">
 <table  class="thinborder" style="margin-left: auto; margin-right: auto;">
 <caption id="components-overview">Table 3: Components Overview</caption>
-<tr><td></td><td>Component</td><td>Core <br>Structures</td><td>Overview</td><td>Specification</td><td>Description</td></tr> 
-<tr><td>1</td><td style="text-align: left;">Entities and Activities</td><td>&#10004;</td><td><a href="#section-entity-activity">2.1.1</a></td><td><a href="#component1">5.1</a></td><td  style="text-align: left;">about entities and activities, and their interrelations</td></tr> 
-<tr><td>2</td><td style="text-align: left;">Agent and Responsibility</td><td>&#10004;</td><td><a href="#section-agents-attribution-association-responsibility">2.1.2</a></td><td><a href="#component2">5.2</a></td><td style="text-align: left;">about agents and concepts ascribing responsibility to them</td></tr> 
+<tr><td style="border-width: 0px; "></td><td>Component</td><td>Core <br>Structures</td><td>Overview</td><td>Specification</td><td>Description</td></tr> 
+<tr><td style="border-width: 0px; "></td><td style="border-width: 0px; "></td><td style="border-width: 0px; "></td><td style="border-width: 0px; "></td><td style="border-width: 0px; "></td></tr>
+<tr><td style="	padding: 8px;">1</td><td style="text-align: left;">Entities and Activities</td><td>&#10004;</td><td><a href="#section-entity-activity">2.1.1</a></td><td><a href="#component1">5.1</a></td><td  style="text-align: left;">about entities and activities, and their interrelations</td></tr> 
+<tr><td>2</td><td style="text-align: left;">Agent and Responsibility</td><td>&#10004;</td><td><a href="#section-agents-attribution-association-delegation">2.1.2</a></td><td><a href="#component2">5.2</a></td><td style="text-align: left;">about agents and concepts ascribing responsibility to them</td></tr> 
 <tr><td>3</td><td style="text-align: left;">Derivation</td><td>&#10004;</td><td><a href="#section-derivation">2.1.3</a></td><td><a href="#component3">5.3</a></td><td  style="text-align: left;">about derivations and its subtypes</td></tr> 
 <tr><td>4</td><td style="text-align: left;">Alternate</td><td></td><td>&mdash;</td><td><a href="#component4">5.4</a></td><td  style="text-align: left;">about relations linking entities referring the same thing</td></tr> 
 <tr><td>5</td><td style="text-align: left;">Bundles</td><td></td><td><a href="#section-provenance-of-provnance">2.2.2</a></td><td><a href="#component5">5.5</a></td><td style="text-align: left;">about bundles, a mechanism to support provenance of provenance</td></tr> 
@@ -858,13 +883,13 @@
 
 <li>
 PROV-N <em>optional arguments</em> need not be specified:
-the general rule for optional arguments is that, if none of them are used in the expression, then they are simply omitted, resulting in a simpler expression. However, it may be the case that only some of the optional arguments need to be specified. Because the position of the arguments in the expression matters, in this case an additional marker must be used to indicate that a particular term is not available. The syntactic marker  '<span class="name">-</span>' is used for this purpose.
+the general rule for optional arguments is that, if none of them are used in the expression, then they are simply omitted, resulting in a simpler expression. However, it may be the case that only some of the optional arguments need to be specified. Because the position of the arguments in the expression matters, in this case, an additional marker must be used to indicate that a particular term is not available. The syntactic marker  '<span class="name">-</span>' is used for this purpose.
 </li>
 
 <li>Most expressions 
 include an identifier 
 and a set of attribute-value pairs; both are optional unless otherwise specified. By convention, the identifier occurs in the <em>first position</em>, and the set of attribute-value pairs in the <em>last position</em>.
-Consistent with the convention on arguments, the marker  <span class="name">-</span> can be used when the identifier is not available, or can be omitted altogether with no ambiguity arising.
+Consistent with the convention on arguments, the marker  '<span class="name">-</span>' can be used when the identifier is not available, or can be omitted altogether with no ambiguity arising. To further disambiguate expressions that contains an optional identifier, the optional identifier or marker must be followed by '<span class="name">;</span>'.
 </li>
 </ul>
 
@@ -884,7 +909,7 @@
 used(a1,e1)
 wasGeneratedBy(e2,a1)
 </pre>
-The same description, but with an explicit identifier <span class="name">u1</span> for the usage, and the syntactic marker <span class="name">-</span> to mark the absence of identifier in the generation.
+The same descriptions, but with an explicit identifier <span class="name">u1</span> for the usage, and the syntactic marker '<span class="name">-</span>' to mark the absence of identifier in the generation. Both are followed by  '<span class="name">;</span>'.
 <pre class="codeexample" >
 used(u1;a1,e1)
 wasGeneratedBy(-;e2,a1)
@@ -1130,9 +1155,9 @@
 
 <h2>PROV-DM Types and Relations</h2>
 
-<p>Provenance concepts, expressed as PROV-DM types and relations, are structured according to six components that are introduced in this section.
-The components and their dependencies are illustrated in <a href="#prov-dm-components">Figure 4</a>. A component that relies on concepts defined in another also sits above it in this figure.
-PROV-DM consists of the following components.</p>
+<p>Provenance concepts, expressed as PROV-DM types and relations, are organized according to six components that are defined in this section.
+The components and their dependencies are illustrated in <a href="#prov-dm-components">Figure 4</a>. A component that relies on concepts defined in another is displayed above it in the figure.  So, for example, component 6 (collections) depends on concepts defined in component 3 (derivation), itself dependen on concepts defined in component 1 (entity and activity).
+</p>
 
 <div id="prov-dm-components-ul">
 <ul>
@@ -1163,7 +1188,7 @@
 </div>
 
 <p>
-While  not all PROV-DM relations are binary, they all involve two primary elements. Hence, <a href="#relations-at-a-glance">Table 3</a> indexes all relations according to their two primary elements.  The table adopts the same color scheme as <a href="#prov-dm-components">Figure 4</a>, allowing components to be readily identified.
+While  not all PROV-DM relations are binary, they all involve two primary elements. Hence, <a href="#relations-at-a-glance">Table 4</a> indexes all relations according to their two primary elements (referred to as subject and object).  The table adopts the same color scheme as <a href="#prov-dm-components">Figure 4</a>, allowing components to be readily identified.
 Note that for simplicity, this table  does not include bundle-oriented and collection-oriented relations.
 Relation names appearing in bold correspond to the core structures introduced
 in <a href="#core-structures">Section 2.1</a>.</p>
@@ -1171,55 +1196,68 @@
 
 <div id="relations-at-a-glance-div" style="text-align: center;">
 <table   class="thinborder" style="margin-left: auto; margin-right: auto;">
-<caption id="relations-at-a-glance">Table 3: PROV-DM Relations At a Glance</caption>
-<tr><td></td><td>Entity</td><td>Activity</td><td>Agent</td></tr> 
-<tr><td>Entity</td><td><div class="component3-color"><a class="essential">wasDerivedFrom</a><br><a>wasRevisionOf</a><br><a>wasQuotedFrom</a><br><a>hadOriginalSource</a></div><div class="component4-color"><a>alternateOf</a><br><a>specializationOf</a></div></td><td class="component1-color"><a class="essential"
+<caption id="relations-at-a-glance">Table 4: PROV-DM Relations At a Glance</caption>
+<tr><td style="border-width: 0px; "></td><td style="border-width: 0px; "></td><td colspan="3">Object</td></tr> 
+<tr><td style="border-width: 0px; "></td><td style="border-width: 0px; "></td><td>Entity</td><td>Activity</td><td>Agent</td></tr> 
+<tr><td rowspan="3">Subject</td><td>Entity</td><td><div class="component3-color"><a class="essential">wasDerivedFrom</a><br><a>wasRevisionOf</a><br><a>wasQuotedFrom</a><br><a>hadOriginalSource</a></div><div class="component4-color"><a>alternateOf</a><br><a>specializationOf</a></div></td><td class="component1-color"><a class="essential"
 title="wasGeneratedBy">wasGeneratedBy</a><br><a
 title="wasInvalidatedBy">wasInvalidatedBy</a></td><td class="component2-color"><a class="essential">wasAttributedTo</a></td></tr>
-<tr><td>Activity</td><td><div class="component1-color"><a class="essential">used</a><br><a>wasStartedBy</a><br><a>wasEndedBy</a></div></td><td class="component1-color"><a>wasInformedBy</a></td><td class="component2-color"><a class="essential">wasAssociatedWith</a></td></tr>
+<tr><td>Activity</td><td><div class="component1-color"><a class="essential">used</a><br><a>wasStartedBy</a><br><a>wasEndedBy</a></div></td><td class="component1-color"><a class="essential">wasInformedBy</a></td><td class="component2-color"><a class="essential">wasAssociatedWith</a></td></tr>
 <tr><td>Agent</td><td>&mdash;</td><td>&mdash;</td><td class="component2-color"><a class="essential">actedOnBehalfOf</a></td></tr>
 </table>
 </div>
 
-<p><a href="#prov-dm-types-and-relations">Table 4</a> is a complete index of all the types and relations of PROV-DM, color-coded according to the component they belong to.  In the first column,  concept names  link to their informal definition, whereas, in the second column, representations link to the information used to represent the concept. Concept names appearing in bold are the core structures introduced in <a href="#core-structures">Section 2.1</a>.</p>
+<p><a href="#prov-dm-types-and-relations">Table 5</a> is a complete index of all the types and relations of PROV-DM, color-coded according to the component they belong to.  In the first column,  concept names  link to their informal definition, whereas, in the second column, representations link to the information used to represent the concept. Concept names appearing in bold are the core structures introduced in <a href="#core-structures">Section 2.1</a>.</p>
 
 
 <div id="prov-dm-types-and-relations-fig" style="text-align: left;">
 <table  class="thinborder" style="margin-left: auto; margin-right: auto;">
-<caption id="prov-dm-types-and-relations">Table 4: PROV-DM Types and Relations</caption>
+<caption id="prov-dm-types-and-relations">Table 5: PROV-DM Types and Relations</caption>
 <tr><td><a><b>Type or Relation Name</b></a></td><td><b>Representation in the PROV-N notation</b></td><td><b>Component</b></td></tr>
+<tr><td style="border-width: 0px; "></td><td style="border-width: 0px; "></td><td style="border-width: 0px; "></td></tr>
+
 <tr class="component1-color"><td class="essential"><a>Entity</a></td><td><a title="dfn-Entity" class="essential">entity(id, [ attr1=val1, ...])</a></td><td rowspan="8"><a href="#component1">Component 1: entities/activities</a></td></tr>
 <tr class="component1-color"><td class="essential"><a>Activity</a></td><td><a title="dfn-Activity" class="essential">activity(id, st, et, [ attr1=val1, ...])</a></td></tr>
 <tr class="component1-color"><td class="essential"><a>Generation</a></td><td><a title="wasGeneratedBy"><span class="essential">wasGeneratedBy(</span>id;<span class="essential">e,a</span>,t,attrs<span class="essential">)</span></a></td></tr>
 <tr class="component1-color"><td class="essential"><a>Usage</a></td><td><a title="used"><span class="essential">used(</span>id;<span class="essential">a,e</span>,t,attrs<span class="essential">)</span></a></td></tr>
+<tr class="component1-color"><td class="essential"><a>Communication</a></td><td><a title="wasInformedBy">wasInformedBy(id;a2,a1,attrs)</a></td></tr>
 <tr class="component1-color"><td><a>Start</a></td><td><a title="wasStartedBy">wasStartedBy(id;a2,e,a1,t,attrs)</a></td></tr>
 <tr class="component1-color"><td><a>End</a></td><td><a title="wasEndedBy">wasEndedBy(id;a2,e,a1,t,attrs)</a></td></tr>
 <tr class="component1-color"><td><a>Invalidation</a></td><td><a title="wasInvalidatedBy">wasInvalidatedBy(id;e,a,t,attrs)</a></td></tr>
-<tr class="component1-color"><td><a>Communication</a></td><td><a title="wasInformedBy">wasInformedBy(id;a2,a1,attrs)</a></td></tr>
-<tr class="component2-color"><td  class="essential"><a>Agent</a></td><td><a title="dfn-agent" class="essential">agent(id, [ attr1=val1, ...])</a></td><td  rowspan="8"><a href="#component2">Component 2: agents/responsibility</a></td></tr>
+<tr><td style="border-width: 0px; "></td><td style="border-width: 0px; "></td><td style="border-width: 0px; "></td></tr>
+
+<tr class="component2-color" style="border-collapse: collapse; "><td  class="essential"><a>Agent</a></td><td><a title="dfn-agent" class="essential">agent(id, [ attr1=val1, ...])</a></td><td  rowspan="8"><a href="#component2">Component 2: agents/responsibility</a></td></tr>
 <tr class="component2-color"><td class="essential"><a>Attribution</a></td><td><a title="wasAttributedTo"><span class="essential">wasAttributedTo(</span>id;<span class="essential">e,ag</span>,attr<span class="essential">)</span></a></td></tr>
 <tr class="component2-color"><td class="essential"><a>Association</a></td><td><a title="wasAssociatedWith"><span class="essential">wasAssociatedWith(</span>id;<span class="essential">a,ag</span>,pl,attrs<span class="essential">)</span></a></td></tr>
-<tr class="component2-color"><td class="essential"><a>Responsibility</a></td><td><a title="actedOnBehalfOf"><span class="essential">actedOnBehalfOf(</span>id;<span class="essential">ag2,ag1</span>,a,attrs<span class="essential">)</span></a></td></tr>
+<tr class="component2-color"><td class="essential"><a>Delegation</a></td><td><a title="actedOnBehalfOf"><span class="essential">actedOnBehalfOf(</span>id;<span class="essential">ag2,ag1</span>,a,attrs<span class="essential">)</span></a></td></tr>
 <tr class="component2-color"><td class="provType"><a>Plan</a></td><td><a title="plan">... prov:type='prov:Plan' ...</a></td>
 <tr class="component2-color"><td class="provType"><a>Person</a></td><td><a title="person">... prov:type='prov:Person' ...</a></td>
 <tr class="component2-color"><td class="provType"><a>Organization</a></td><td><a title="organization">... prov:type='prov:Organization' ...</a></td>
 <tr class="component2-color"><td class="provType"><a title="software-agent">SoftwareAgent</a></td><td><a title="software-agent">... prov:type='prov:SoftwareAgent' ...</a></td>
+<tr><td style="border-width: 0px; "></td><td style="border-width: 0px; "></td><td style="border-width: 0px; "></td></tr>
+
 <tr class="component3-color"><td class="essential"><a>Derivation</a></td><td><a title="wasDerivedFrom"><span class="essential">wasDerivedFrom(</span>id; <span class="essential">e2, e1</span>, a, g2, u1, attrs<span class="essential">)</span></a></td><td  rowspan="5"><a href="#component3">Component 3: derivation</a></td></tr>
 <tr class="component3-color"><td class="provType"><a>Revision</a></td><td><a title="revision">... prov:type='prov:WasRevisionOf' ...</a></td></tr>
-<tr class="component3-color"><td class="provType"><a>Quotation</a></td><td><a title="quotation">... prov:type='prov:WasQuotedFrom' ...</a></a></td></tr>
+<tr class="component3-color"><td class="provType"><a>Quotation</a></td><td><a title="quotation">... prov:type='prov:WasQuotedFrom' ...</a></td></tr>
 <tr class="component3-color"><td class="provType"><a>Original Source</a></td><td><a title="Original Source">... prov:type='prov:HadOriginalSource' ...</a></td></tr>
 <tr class="component3-color"><td><a>Trace</a></td><td><a title="tracedTo">tracedTo(id;e2,e1,attrs)</a></td></tr>
+<tr><td style="border-width: 0px; "></td><td style="border-width: 0px; "></td><td style="border-width: 0px; "></td></tr>
+
 <tr class="component4-color"><td><a>Alternate</a></td><td><a title="alternateOf">alternateOf(alt1, alt2)</a></td><td  rowspan="2"><a href="#component4">Component 4: alternate</a></td></tr>
 <tr class="component4-color"><td><a>Specialization</a></td><td><a title="specializationOf">specializationOf(sub, super)</a></td></tr>
-<tr class="component6-color"><td><a title="bundle">Bundle constructor</a></td><td><a title="dfn-bundle">bundle id description_1 ... description_n endBundle</a></td><td  rowspan="3"><a href="#component5">Component 5: bundles</a></td></tr>
-<tr class="component6-color"><td class="provType"><a title="bundle">Bundle description</a></td><td><a>... prov:type='prov:Bundle' ...</a></td></tr>
-<tr class="component6-color"><td><a>Provenance Locator</a></td><td><a title="hasProvenanceIn">hasProvenanceIn(id, subject, bundle, target, service, prov, attrs)</a></td></tr>
-<tr class="component5-color"><td class="provType"><a>Collection</a></td><td><a title="collection">... prov:type='prov:Collection' ...</a></td><td  rowspan="6"><a href="#component6">Component 6: Collections</a></td></tr>
-<tr class="component5-color"><td class="provType"><a>Dictionary</a></td><td><a title="dictionary">... prov:type='prov:Dictionary' ...</a></td></tr>
-<tr class="component5-color"><td class="provType"><a title="empty collection">EmptyCollection</a></td><td><a title="empty collection">... prov:type='prov:EmptyCollection' ...</a></td></tr>
-<tr class="component5-color"><td><a>Insertion</a></td><td><a title="derivedByInsertionFrom">derivedByInsertionFrom(id; c2, c1, {(key_1, e_1), ..., (key_n, e_n)}, attrs)</a></td></tr>
-<tr class="component5-color"><td><a>Removal</a></td><td><a title="derivedByRemovalFrom">derivedByRemovalFrom(id; c2, c1, {key_1, ... key_n}, attrs)</a></td></tr>
-<tr class="component5-color"><td><a>Membership</a></td><td><a title="memberOf">memberOf(c, {(key_1, e_1), ..., (key_n, e_n)})</a></td></tr>
+<tr><td style="border-width: 0px; "></td><td style="border-width: 0px; "></td><td style="border-width: 0px; "></td></tr>
+
+<tr class="component5-color"><td><a title="bundle">Bundle constructor</a></td><td><a title="dfn-bundle">bundle id description_1 ... description_n endBundle</a></td><td  rowspan="3"><a href="#component5">Component 5: bundles</a></td></tr>
+<tr class="component5-color"><td class="provType"><a title="bundle">Bundle description</a></td><td><a>... prov:type='prov:Bundle' ...</a></td></tr>
+<tr class="component5-color"><td><a>Provenance Locator</a></td><td><a title="hasProvenanceIn">hasProvenanceIn(id, subject, bundle, target, service, prov, attrs)</a></td></tr>
+<tr><td style="border-width: 0px; "></td><td style="border-width: 0px; "></td><td style="border-width: 0px; "></td></tr>
+
+<tr class="component6-color"><td class="provType"><a>Collection</a></td><td><a title="collection">... prov:type='prov:Collection' ...</a></td><td  rowspan="6"><a href="#component6">Component 6: Collections</a></td></tr>
+<tr class="component6-color"><td class="provType"><a>Dictionary</a></td><td><a title="dictionary">... prov:type='prov:Dictionary' ...</a></td></tr>
+<tr class="component6-color"><td class="provType"><a title="empty collection">EmptyCollection</a></td><td><a title="empty collection">... prov:type='prov:EmptyCollection' ...</a></td></tr>
+<tr class="component6-color"><td><a>Insertion</a></td><td><a title="derivedByInsertionFrom">derivedByInsertionFrom(id; c2, c1, {(key_1, e_1), ..., (key_n, e_n)}, attrs)</a></td></tr>
+<tr class="component6-color"><td><a>Removal</a></td><td><a title="derivedByRemovalFrom">derivedByRemovalFrom(id; c2, c1, {key_1, ... key_n}, attrs)</a></td></tr>
+<tr class="component6-color"><td><a>Membership</a></td><td><a title="memberOf">memberOf(c, {(key_1, e_1), ..., (key_n, e_n)})</a></td></tr>
 </table>
 </div>
 
@@ -1233,13 +1271,12 @@
 <h3>Component 1: Entities and Activities</h3>
 
 <p>The first component of PROV-DM is concerned with <a title="entity">entities</a> and <a title="activity">activities</a>, and their interrelations: <a>Usage</a>, <a>Generation</a>, <a>Start</a>, <a>End</a>, <a>Invalidation</a>, and <a>Communication</a>.  <a href="#figure-component1">Figure 5</a> uses UML to depict the first component.
-Core structures are displayed in the yellow area, consisting of two classes (<a>Entity</a>, <a>Activity</a>) and two binary associations between them (<a>Usage</a>, <a>Generation</a>). The rest of the figure displays extended structures, including UML associations classes (represented in gray) to express expanded n-ary relations (for <a>Usage</a>, <a>Generation</a>, <a>Invalidation</a>, <a>Start</a>, <a>End</a>,  <a>Communication</a>). The figure also makes explicit <em>time</em> attributes for these concepts (time being represented as a primitive).
+Core structures are displayed in the yellow area, consisting of two classes (<a>Entity</a>, <a>Activity</a>) and three binary associations between them (<a>Usage</a>, <a>Generation</a>, and <a>Communication</a>). The rest of the figure displays extended structures, including UML associations classes (represented in gray) to express expanded n-ary relations (for <a>Usage</a>, <a>Generation</a>, <a>Invalidation</a>, <a>Start</a>, <a>End</a>). The figure also makes explicit associations with <em>time</em> for these concepts (time being marked with the primitive stereotype).
 </p>
 
 <div style="text-align: center;">
 <figure>
 <!--<img src="images/Entities-Activities.png" alt="entities and activities"/> -->
-
 <img src="uml/component1.png" alt="entities and activities"/>
 <figcaption id="figure-component1">Figure 5: Entities and Activities Component Overview</figcaption>
 </figure>
@@ -1270,7 +1307,7 @@
 entity(tr:WD-prov-dm-20111215, [ prov:type="document", ex:version="2" ])
 </pre>
 states the existence of an entity, denoted by identifier <span class="name">tr:WD-prov-dm-20111215</span>,  with type <span class="name">document</span> and version number <span class="name">2</span>. The attribute <span class="name">ex:version</span> is application specific, whereas the attribute <span
-class="name">type</span> (see <a href="#term-attribute-type">Section 4.7.4.4</a>) is reserved in the <a title="prov-namespace">PROV namespace</a>.
+class="name">type</span> (see <a href="#term-attribute-type">Section 5.7.4.4</a>) is reserved in the <a title="prov-namespace">PROV namespace</a>.
 <!--The following expression</p>
 <pre class="codeexample">
 entity(tr:WD-prov-dm-20111215, [ prov:type="document", ex:version="2" ])
@@ -1309,7 +1346,7 @@
 </pre>
 <p>states the existence of an activity with identifier <span class="name">a1</span>, start time <span class="name">2011-11-16T16:05:00</span>, and end time <span
 class="name">2011-11-16T16:06:00</span>, running on host <span class="name">server.example.org</span>, and of type <span class="name">edit</span>.  The attribute <span class="name">host</span>  is application specific  (declared in some namespace with prefix <span class="name">ex</span>).  The attribute <span
-class="name">type</span> is a reserved attribute of PROV-DM, allowing for sub-typing to be expressed  (see <a href="#term-attribute-type">Section 4.7.4.4</a>).</p>
+class="name">type</span> is a reserved attribute of PROV-DM, allowing for sub-typing to be expressed  (see <a href="#term-attribute-type">Section 5.7.4.4</a>).</p>
 </div>
 
 
@@ -1340,7 +1377,7 @@
 
 <li><span class='attribute' id="generation.attributes">attributes</span>:  an OPTIONAL set (<span class="name">attrs</span>) of attribute-value pairs representing additional information about this generation.</li>
 </ul></div>
-<p>While each of <span class='attribute'>activity</span>, <span class='attribute'>time</span>, and  <span class='attribute'>attributes</span> is OPTIONAL, at least one of them MUST be present.</p>
+<p>While each of <a href="#generation.id"><span class='attribute'>id</span></a>, <a href="#generation.activity"><span class='attribute'>activity</span></a>, <a href="#generation.time"><span class='attribute'>time</span></a>, and  <a href="#generation.attributes"><span class='attribute'>attributes</span></a> is OPTIONAL, at least one of them MUST be present.</p>
 
 
 
@@ -1350,8 +1387,8 @@
 <p>
 The following expressions</p>
 <pre class="codeexample">
-  wasGeneratedBy(e1,a1, 2001-10-26T21:32:52, [ex:port="p1"])
-  wasGeneratedBy(e2,a1, 2001-10-26T10:00:00, [ex:port="p2"])
+  wasGeneratedBy(e1, a1, 2001-10-26T21:32:52, [ ex:port="p1" ])
+  wasGeneratedBy(e2, a1, 2001-10-26T10:00:00, [ ex:port="p2" ])
 </pre>
 <p>state the existence of two generations (with respective times <span class="name">2001-10-26T21:32:52</span> and <span
 class="name">2001-10-26T10:00:00</span>), at which new entities,  identified by <span class="name">e1</span> and <span class="name">e2</span>, are created by an
@@ -1365,7 +1402,7 @@
 <p>
 In some cases, we may want to record the time at which an entity was generated without having to specify the activity that generated it. To support this requirement, the activity element in generation is optional. Hence,  the following expression indicates the time at which an entity is generated, without naming the activity that did it.</p>
 <pre class="codeexample">
-  wasGeneratedBy(e,-,2001-10-26T21:32:52)
+  wasGeneratedBy(e, -, 2001-10-26T21:32:52)
 </pre>
 </div>
 
@@ -1382,12 +1419,14 @@
 <p><div class="attributes" id="attributes-usage"><dfn title="used">Usage</dfn><span class="withPn">, written <span class="pnExpression">used(id;a,e,t,attrs)</span> in PROV-N,</span> has:
 <ul>
 <li><span class='attribute' id="usage.id">id</span>:  an OPTIONAL identifier for a usage;</li> 
-<li><span class='attribute' id="usage.activity">activity</span>: an identifier (<span class="name">a</span>) for the consuming activity;</li>
-<li><span class='attribute' id="usage.entity">entity</span>: an identifier (<span class="name">e</span>) for the consumed entity;</li>
+<li><span class='attribute' id="usage.activity">activity</span>: an identifier (<span class="name">a</span>) for the activity that used an entity;</li>
+<li><span class='attribute' id="usage.entity">entity</span>: an OPTIONAL identifier (<span class="name">e</span>) for the  entity being used;</li>
 <li><span class='attribute' id="usage.time">time</span>: an OPTIONAL "usage time" (<span class="name">t</span>), the time at which the entity started to be used;</li>
 <li><span class='attribute' id="usage.attributes">attributes</span>: an OPTIONAL set (<span class="name">attrs</span>) of attribute-value pairs representing additional information about this usage.</li>
 </ul></div>
 
+<p>While each of <a href="#usage.id"><span class='attribute'>id</span></a>, <a href="#usage.entity"><span class='attribute'>entity</span></a>, <a href="#usage.time"><span class='attribute'>time</span></a>, and  <a href="#usage.attributes"><span class='attribute'>attributes</span></a> is OPTIONAL, at least one of them MUST be present.</p>
+
 <p>
 A reference to a given entity MAY appear in multiple usages that share
  a given activity identifier. 
@@ -1397,8 +1436,8 @@
 <div class='anexample'>
 <p>The following usages</p>
 <pre class="codeexample">
-  used(a1,e1,2011-11-16T16:00:00,[ex:parameter="p1"])
-  used(a1,e2,2011-11-16T16:00:01,[ex:parameter="p2"])
+  used(a1, e1, 2011-11-16T16:00:00, [ ex:parameter="p1" ])
+  used(a1, e2, 2011-11-16T16:00:01, [ ex:parameter="p2" ])
 </pre>
 <p>state that the activity identified by <span class="name">a1</span> used two entities identified by <span
 class="name">e1</span> and <span class="name">e2</span>, at times <span class="name">2011-11-16T16:00:00</span> and  <span class="name">2011-11-16T16:00:01</span>, respectively; the first
@@ -1413,6 +1452,41 @@
 
 </section>
 
+<section id="term-wasInformedBy">
+<h3>Communication</h3>
+
+<div class="glossary-ref" data-ref="glossary-communication"></div>
+
+
+<p>A communication implies that activity  <span class="name">a2</span> is dependent on another <span class="name">a1</span>, by way of some unspecified entity that is generated by <span class="name">a1</span> and used by <span class="name">a2</span>.</p>
+
+
+
+
+<p><div class="attributes" id="attributes-wasInformedBy">
+A <dfn title="wasInformedBy">communication</dfn><span class="withPn">, written as 
+<span class="pnExpression">wasInformedBy(id;a2,a1,attrs)</span> in PROV-N,</span> has: 
+<ul>
+<li><span class='attribute' id="wasInformedBy.id">id</span>:  an OPTIONAL identifier  identifying the relation;</li> 
+<li><span class='attribute' id="wasInformedBy.informed">informed</span>: the identifier (<span class="name">a2</span>) of the informed activity;
+<li><span class='attribute' id="wasInformedBy.informant">informant</span>: the identifier (<span class="name">a1</span>) of the informant activity;
+<li><span class='attribute' id="wasInformedBy.attributes">attributes</span>: an OPTIONAL set (<span class="name">attrs</span>) of attribute-value pairs representing additional information about this communication.</li>
+</ul>
+</div>
+
+
+
+<div class="anexample">
+<p>
+Consider two activities  <span class="name">a1</span> and <span class="name">a2</span>, the former performed by a government agency, and the latter by a driver caught speeding. 
+<pre class="codeexample">
+activity(a1, [ prov:type="traffic regulations enforcing" ])
+activity(a2, [ prov:type="fine paying, check writing, and mailing" ])
+wasInformedBy(a2, a1)
+</pre>
+The last line indicates that some implicit entity was generated by  <span class="name">a1</span> and used by  <span class="name">a2</span>; this entity may be a traffic ticket that had a notice of fine, amount, and payment mailing details.
+</div>
+</section>
 
 <section id="term-Start">
 <h4>Start</h4>
@@ -1551,7 +1625,7 @@
 
 <li><span class='attribute'>attributes</span>:  an OPTIONAL set of attribute-value pairs representing additional information about this invalidation.</li>
 </ul></div>
-<p>While each of <span class='attribute'>activity</span>, <span class='attribute'>time</span>, and  <span class='attribute'>attributes</span> is OPTIONAL, at least one of them MUST be present.</p>
+<p>While each of <span class='attribute'>id</span>, <span class='attribute'>activity</span>, <span class='attribute'>time</span>, and  <span class='attribute'>attributes</span> is OPTIONAL, at least one of them MUST be present.</p>
 
 
 
@@ -1580,7 +1654,7 @@
 wasGeneratedBy  (ex:bbcNews2012-04-03,-,2012-04-03T00:00:01)
 wasInvalidatedBy(ex:bbcNews2012-04-03,-,2012-04-03T23:59:59)
 </pre>
-We refer to example <a href="#anexample-specialization">anexample-specialization</a> for further descriptions of the BBC Web site, and to Section <a>Membership</a> for a description of the relation <a>memberOf</a>.
+We refer to example <a href="#anexample-specialization">anexample-specialization</a> for further descriptions of the BBC Web site, and to  <a href="#term-dictionary-membership">Section 5.6.5</a> for a description of the relation <a>memberOf</a>.
 </div>
 
 
@@ -1615,41 +1689,6 @@
 </section>
 
 
-<section id="term-wasInformedBy">
-<h3>Communication</h3>
-
-<div class="glossary-ref" data-ref="glossary-communication"></div>
-
-
-<p>A communication implies that activity  <span class="name">a2</span> is dependent on another <span class="name">a1</span>, by way of some unspecified entity that is generated by <span class="name">a1</span> and used by <span class="name">a2</span>.</p>
-
-
-
-
-<p><div class="attributes" id="attributes-wasInformedBy">
-A <dfn title="wasInformedBy">communication</dfn><span class="withPn">, written as 
-<span class="pnExpression">wasInformedBy(id;a2,a1,attrs)</span> in PROV-N,</span> has: 
-<ul>
-<li><span class='attribute' id="wasInformedBy.id">id</span>:  an OPTIONAL identifier  identifying the relation;</li> 
-<li><span class='attribute' id="wasInformedBy.informed">informed</span>: the identifier (<span class="name">a2</span>) of the informed activity;
-<li><span class='attribute' id="wasInformedBy.informant">informant</span>: the identifier (<span class="name">a1</span>) of the informant activity;
-<li><span class='attribute' id="wasInformedBy.attributes">attributes</span>: an OPTIONAL set (<span class="name">attrs</span>) of attribute-value pairs representing additional information about this communication.</li>
-</ul>
-</div>
-
-
-
-<div class="anexample">
-<p>
-Consider two activities  <span class="name">a1</span> and <span class="name">a2</span>, the former performed by a government agency, and the latter by a driver caught speeding. 
-<pre class="codeexample">
-activity(a1, [prov:type="traffic regulations enforcing"])
-activity(a2, [prov:type="fine paying, check writing, and mailing"])
-wasInformedBy(a2,a1)
-</pre>
-The last line indicates that some implicit entity was generated by  <span class="name">a1</span> and used by  <span class="name">a2</span>; this entity may be a traffic ticket that had a notice of fine, amount, and payment mailing details.
-</div>
-</section>
 
 
 
@@ -1659,8 +1698,8 @@
 <h3>Component 2: Agents and Responsibility</h3>
 
 <p>The second component of PROV-DM, depicted in  <a href="#figure-component2">Figure 6</a>, is concerned with <a title="agent">agents</a> and the notions of
-<a>Attribution</a>, <a>Association</a>, <a>Responsibility</a>, relating agents to entities, activities, and agents, respectively.
- Core structures are displayed in the yellow area and include three classes and three binary associations. Outside the yellow area, extended structures comprise the subclass <a>Plan</a> and UML association classes to express expanded n-ary relations.
+<a>Attribution</a>, <a>Association</a>, <a>Delegation</a>, relating agents to entities, activities, and agents, respectively.
+ Core structures are displayed in the yellow area and include three classes and three binary associations. Outside the yellow area, extended structures comprise and UML association classes to express expanded n-ary relations, and subclasses <a>Plan</a>, <a>Person</a>, <a title="software-agent">SofwareAgent</a>, and <a>Organization</a>. The subclasses are marked by the UML stereotype "prov:type" to indicate that that these are valid values for the attribute <a href="#term-attribute-type">prov:type</a>
 </p>
 
 
@@ -1668,7 +1707,7 @@
 <figure>
 <!-- <img src="images/Agents-Responsibility.png" alt="agents and responsibilities"/> -->
 <img src="uml/component2.png" alt="agents and responsibilities"/>
-<figcaption id="figure-component2">Figure 6: Agents and Responsibilities Component Overview</figcaption>
+<figcaption id="figure-component2">Figure 6: Agents and Responsibility Component Overview</figcaption>
 </figure>
 </div>
 
@@ -1732,15 +1771,15 @@
 <ul>
 <li><span class='attribute' id="attribution.id">id</span>: an OPTIONAL identifier for the relation;</li> 
 <li><span class='attribute' id="attribution.entity">entity</span>: an entity identifier (<span class="name">e</span>);</li>
-<li><span class='attribute' id="attribution.agent">agent</span>: the identifier (<span class="name">ag</span>) of the agent whom the entity is ascribed to;</li>
+<li><span class='attribute' id="attribution.agent">agent</span>: the identifier (<span class="name">ag</span>) of the agent whom the entity is ascribed to, and therefore bears some responsibility for its existence;</li>
 <li><span class='attribute' id="attribution.attributes">attributes</span>: an OPTIONAL set (<span class="name">attrs</span>) of attribute-value pairs representing additional information about this attribution.</li>
 </ul>
 </div>
 
 <div class="anexample" id="anexample-attribution">
 <p>
-Revisiting the example of <a href="#section-example-one">Section 3.1</a>,
-we can ascribe <span class="name">tr:WD-prov-dm-20111215</span> to some agents without an explicit activity. The reserved attribute <span class="name">role</span> (see <a href="#term-attribute-role">Section 4.7.4.3</a>) allows for role of the agent in the attribution to be specified.
+Revisiting the example of <a href="#section-example-one">Section 4.1</a>,
+we can ascribe <span class="name">tr:WD-prov-dm-20111215</span> to some agents without an explicit activity. The reserved attribute <span class="name">role</span> (see <a href="#term-attribute-role">Section 5.7.4.3</a>) allows for role of the agent in the attribution to be specified.
 <pre class="codeexample">
 agent(ex:Paolo, [ prov:type="Person" ])
 agent(ex:Simon, [ prov:type="Person" ])
@@ -1802,18 +1841,13 @@
 
 </section>  <!-- end wasAssociatedWith -->
 
-<section id="term-responsibility">
-
-<h4>Responsibility</h4>
-
-<div class="glossary-ref" data-ref="glossary-responsibility"></div>
-
-<p>PROV offers a mild version of responsibility
-in the form of a relation to represent when an agent acted on another
-agent's behalf.  So for example someone running a mail program,
-the program and the person are both
-agents of the activity; furthermore, the mail software
-agent is running on the person's behalf.  In another example, the
+<section id="term-delegation">
+
+<h4>Delegation</h4>
+
+<div class="glossary-ref" data-ref="glossary-delegation"></div>
+
+<p>For example, a
 student acted on behalf of his supervisor, who acted on behalf of the
 department chair, who acted on behalf of the university; all those
 agents are responsible in some way for the activity that took place but
@@ -1822,22 +1856,22 @@
 
 
 <p>
-<div class="attributes" id="attributes-responsibility">
-A <dfn title="actedOnBehalfOf">responsibility</dfn> link<span class="withPn">, written <span class="pnExpression">actedOnBehalfOf(id;ag2,ag1,a,attrs)</span> in PROV-N,</span> has:
+<div class="attributes" id="attributes-delegation">
+A <dfn title="actedOnBehalfOf">delegation</dfn> link<span class="withPn">, written <span class="pnExpression">actedOnBehalfOf(id;ag2,ag1,a,attrs)</span> in PROV-N,</span> has:
 <ul>
-<li><span class='attribute' id="responsibility.id">id</span>:  an OPTIONAL identifier for the responsibility link between subordinate and responsible;</li> 
-<li><span class='attribute' id="responsibility.subordinate">subordinate</span>: an identifier (<span class="name">ag2</span>) for the agent associated with an activity, acting on behalf of the responsible
+<li><span class='attribute' id="delegation.id">id</span>:  an OPTIONAL identifier for the delegation link between delegate and responsible;</li> 
+<li><span class='attribute' id="delegation.delegate">delegate</span>: an identifier (<span class="name">ag2</span>) for the agent associated with an activity, acting on behalf of the responsible
 agent;</li>
-<li><span class='attribute' id="responsibility.responsible">responsible</span>: an identifier (<span class="name">ag1</span>) for the agent,  on behalf of which the subordinate agent acted;</li>
-<li><span class='attribute' id="responsibility.activity">activity</span>: an OPTIONAL identifier (<span class="name">a</span>) of an activity for which the responsibility link holds;</li>
-<li><span class='attribute' id="responsibility.attributes">attributes</span>: an OPTIONAL set (<span class="name">attrs</span>) of attribute-value pairs representing additional information about this responsibility link.</li>
+<li><span class='attribute' id="delegation.responsible">responsible</span>: an identifier (<span class="name">ag1</span>) for the agent,  on behalf of which the delegate agent acted;</li>
+<li><span class='attribute' id="delegation.activity">activity</span>: an OPTIONAL identifier (<span class="name">a</span>) of an activity for which the delegation link holds;</li>
+<li><span class='attribute' id="delegation.attributes">attributes</span>: an OPTIONAL set (<span class="name">attrs</span>) of attribute-value pairs representing additional information about this delegation link.</li>
 </ul></div>
 
 
 <div class="anexample">
 <p>The following fragment describes three agents: a programmer, a researcher, and a funder.  The programmer and researcher are associated with a workflow activity.  The programmer acts on behalf
-of the researcher (delegation) encoding the commands specified by the researcher; the researcher acts on behalf of the funder, who has a contractual agreement with the researcher. The terms
-'delegation' and 'contact' used in this example are domain specific.</p>
+of the researcher (line-management) encoding the commands specified by the researcher; the researcher acts on behalf of the funder, who has a contractual agreement with the researcher. The terms
+'line-management' and 'contract' used in this example are domain specific.</p>
 <pre class="codeexample">
 activity(a,[prov:type="workflow"])
 agent(ag1,[prov:type="programmer"])
@@ -1846,7 +1880,7 @@
 wasAssociatedWith(a,ag1,[prov:role="loggedInUser"])
 wasAssociatedWith(a,ag2)
 wasAssociatedWith(a,ag3)
-actedOnBehalfOf(ag1,ag2,a,[prov:type="delegation"])
+actedOnBehalfOf(ag1,ag2,a,[prov:type="line-management"])
 actedOnBehalfOf(ag2,ag3,a,[prov:type="contract"])
 </pre>
 </div>
@@ -1961,7 +1995,7 @@
 
 <div class="anexample" id="anexample-revision">
 <p>
-Revisiting the example of <a href="#section-example-two">Section 3.2</a>,
+Revisiting the example of <a href="#section-example-two">Section 4.2</a>,
 we can now state that the report 
  <span class="name">tr:WD-prov-dm-20111215</span> was a revision of 
  the report <span class="name">tr:WD-prov-dm-20111018</span>.
@@ -2092,7 +2126,7 @@
 </p>
 
 <div class="anexample">
-<p>We refer to the example of <a href="#section-example-two">Section 3.1</a>, and specifically to <a href="#prov-a-document2">Figure 3</a>. We can see that there is a path from 
+<p>We refer to the example of <a href="#section-example-two">Section 4.1</a>, and specifically to <a href="#prov-a-document2">Figure 3</a>. We can see that there is a path from 
 <span class="name">tr:WD-prov-dm-20111215</span> to 
 <span class="name">w3:Consortium</span> and to
 <span class="name">process:rec-advance</span>. This is expressed as follows.
@@ -2383,32 +2417,24 @@
 
 <p><div class="glossary-ref" data-ref="glossary-provenance-locator"></div>
 
-
+<p>
 
 
 <div class="attributes" id="attributes-hasProvenanceIn">
 A <dfn title="hasProvenanceIn">provenance locator</dfn>,
 written
-<span class="pnExpression">hasProvenanceIn(id, subject, bundle, target, service, prov, attrs)</span>, has:
+<span class="pnExpression">hasProvenanceIn(id, subject, bundle, target, attrs)</span>, has:
 <ul>
 <li><span class='attribute' id="prov.locator.id">id</span>: an identifier for a provenance locator; </li>
 <li><span class='attribute' id="prov.locator.subject">subject</span>:  an identifier denoting something (entity, activity, agent, or relation instance);</li>
 <li><span class='attribute' id="prov.locator.bundle">bundle</span>:  an OPTIONAL identifier (<span class="name">bundle</span>) for a bundle;
 <li><span class='attribute' id="prov.locator.target">target</span>:  an OPTIONAL identifier (<span class="name">target</span>) denoting  something described in another set of descriptions (referred to as <a href="http://www.w3.org/TR/prov-aq/#dfn-target-uri">Target-URI</a> in [[PROV-AQ]]);
-<li><span class='attribute' id="prov.locator.service">service-uri</span>:  an OPTIONAL URI (<span class="name">service</span>) denoting a <a href="http://www.w3.org/TR/prov-aq/#dfn-provenance-service">provenance service</a> from which provenance can be retrieved (referred to as <a href="http://www.w3.org/TR/prov-aq/#dfn-service-uri">Service-URI</a> in [[PROV-AQ]]);
-<li><span class='attribute' id="prov.locator.provenance">provenance-uri</span>:  an OPTIONAL URI (<span class="name">prov</span>), which when dereferenced, allows access to provenance descriptions (referred to as <a href="http://www.w3.org/TR/prov-aq/#dfn-provenance-uri">Provenance-URI</a> in [[PROV-AQ]]);
-<li><span class='attribute' id="prov.locator.attributes">attributes</span>: an OPTIONAL set (<span class="name">attrs</span>) of attribute-value pairs representing additional information about this locator.</li>
+<li><span class='attribute' id="prov.locator.attributes">attributes</span>: an OPTIONAL set (<span class="name">attrs</span>) of attribute-value pairs representing additional information about this locator; it optionally includes
+<a href="#term-attribute-service-uri"><span class="name">prov:service-uri</span></a> 
+or
+<a href="#term-attribute-provenance-uri"><span class="name">prov:provenance-uri</span></a>.</li>
 </ul>
-<p>In <span class="pnExpression">hasProvenanceIn(id, subject, bundle, target, service, prov, attrs)</span>, <span class="name">service</span> and <span class="name">prov</span> are both optional and mutually exclusive: if specified, either <span class="name">service</span> or <span class="name">prov</span> is provided.</p>
-</div>
-
-<p>A provenance locator specifies a context, referred to
-as <em>located context</em> in which further descriptions can be found
-about something.</p>
-
-<div class="note">
-It is suggested that prov:service-uri and prov:provenance-uri should be made optional reserved attributes.
-In the target is not specified, it is assumed that the target is the same identifier as subject.
+<p>If the target is not specified, it is assumed that target is the same identifier as subject.
 </div>
 
 <p>When the subject and optional target denote entities,
@@ -2417,15 +2443,11 @@
 <div class="anexample" id="anexample-provenance-locator">
 <p>According to the following provenance locator, provenance descriptions about <span class="name">ex:report1</span> can be found in bundle <span class="name">bob:bundle1</span>.</p>
 <pre class="codeexample"> 
-hasProvenanceIn(ex:report1, bob:bundle1, -, -, -)
+hasProvenanceIn(ex:report1, bob:bundle1, -)
 </pre>
 <p>According to the following provenance locator, provenance descriptions about <span class="name">ex:report1</span> can be found in bundle <span class="name">bob:bundle1</span>, which is available from the provenance service identified by the provided URI.</p>
 <pre class="codeexample"> 
-hasProvenanceIn(ex:report1, bob:bundle1, -, "http://example.com/service"^xsd:anyURI, -)
-</pre>
-<p>According to the following provenance locator, provenance descriptions about <span class="name">ex:report1</span> can be found in resource identified by the provided URI.</p>
-<pre class="codeexample"> 
-hasProvenanceIn(ex:report1, -, -, -, "http://example.com/some-provenance.pn"^xsd:anyURI)
+hasProvenanceIn(ex:report1, bob:bundle1, -, [ prov:service-uri="http://example.com/service"^xsd:anyURI ])
 </pre>
 </div>
 
@@ -2445,7 +2467,7 @@
 <pre class="codeexample"> 
 bundle alice:bundle5
   entity(ex:report1)
-  hasProvenanceIn(ex:report1, bob:bundle4, -, -, -)
+  hasProvenanceIn(ex:report1, bob:bundle4, -)
   entity(ex:report2, [ prov:type="report", ex:version=2 ])
   wasGeneratedBy(ex:report2, -, 2012-05-25T11:00:01)
   wasDerivedFrom(ex:report2, ex:report1)
@@ -2463,7 +2485,7 @@
 <pre class="codeexample"> 
 bundle alice:bundle6
   entity(alice:report1)
-  hasProvenanceIn(alice:report1, bob:bundle4, ex:report1, -, -)
+  hasProvenanceIn(alice:report1, bob:bundle4, ex:report1)
   entity(ex:report2, [ prov:type="report", ex:version=2 ])
   wasGeneratedBy(ex:report2, -, 2012-05-25T11:00:01)
   wasDerivedFrom(ex:report2, alice:report1)
@@ -2494,13 +2516,13 @@
   wasAttributedTo(tool:bundle8, viz:Visualizer)
 
   entity(ex:report1, [viz:color="orange"])
-  hasProvenanceIn(ex:report1, obs:bundle7, -, -, -)
+  hasProvenanceIn(ex:report1, obs:bundle7, -)
 
   entity(ex:report2, [viz:color="blue"])
-  hasProvenanceIn(ex:report2, obs:bundle7, -, -, -)
+  hasProvenanceIn(ex:report2, obs:bundle7, -)
 
   wasDerivedBy(ex:d; ex:report2, ex:report1, [viz:style="dotted"])
-  hasProvenanceIn(ex:d, obs:bundle7, -, -, -)
+  hasProvenanceIn(ex:d, obs:bundle7, -)
 endBundle
 </pre>
 
@@ -2870,13 +2892,17 @@
 
 <div id="attributes-at-a-glance-div" style="text-align: left;">
 <table   class="thinborder" style="margin-left: auto; margin-right: auto;">
-<caption id="attributes-at-a-glance">Table 5: PROV-DM Attributes At a Glance</caption>
-<tr><td><b>Attribute</b></td><td><b>value</b></td><td><b>Section</b></td></tr> 
-<tr><td>prov:label</td><td>xsd:string</td><td>Section <a href="#term-attribute-label">4.7.4.1</a> </td></tr>
-<tr><td>prov:location</td><td><a title="value">Value</a></td><td>Section <a href="#term-attribute-location">4.7.4.2</a> </td></tr>
-<tr><td>prov:role</td><td><a title="value">Value</a></td><td>Section <a href="#term-attribute-role">4.7.4.3</a> </td></tr>
-<tr><td>prov:type</td><td><a title="value">Value</a></td><td>Section <a href="#term-attribute-type">4.7.4.4</a> </td></tr>
-<tr><td>prov:value</td><td><a title="value">Value</a></td><td>Section <a href="#term-attribute-value">4.7.4.5</a> </td></tr>
+<caption id="attributes-at-a-glance">Table 6: PROV-DM Attributes At a Glance</caption>
+<tr><td><b>Attribute</b></td><td><b>Allowed In</b></td><td><b>value</b></td><td><b>Section</b></td></tr> 
+<tr><td style="border-width: 0px; "></td><td style="border-width: 0px; "></td><td style="border-width: 0px; "><td style="border-width: 0px; "></td></tr>
+<tr><td>prov:label</td><td><em>any construct</em></td><td><a href="http://www.w3.org/TR/xmlschema-2/#string">xsd:string</a></td><td>Section <a href="#term-attribute-label">5.7.4.1</a> </td></tr>
+<tr><td>prov:location</td><td><a>Entity</a>, <a>Activity</a>, <br> <a>Usage</a>, and <a>Generation</a>.</td><td><a title="value">Value</a></td><td>Section <a href="#term-attribute-location">5.7.4.2</a> </td></tr>
+<tr><td>prov:role</td><td><a>Usage</a>, <a>Generation</a>, <br> <a>Association</a>, <a>Start</a>, and <a>End</a></td><td><a title="value">Value</a></td><td>Section <a href="#term-attribute-role">5.7.4.3</a> </td></tr>
+<tr><td>prov:type</td><td><em>any construct</em></td><td><a title="value">Value</a></td><td>Section <a href="#term-attribute-type">5.7.4.4</a> </td></tr>
+<tr><td>prov:value</td><td><a>Entity</a></td><td><a title="value">Value</a></td><td>Section <a href="#term-attribute-value">5.7.4.5</a> </td></tr>
+
+<tr><td>prov:provenance-uri</td><td><a>Provenance Locator</a></td><td><a href="http://www.w3.org/TR/xmlschema-2/#anyURI">xsd:anyURI</a></td><td>Section <a href="#term-attribute-provenance-uri">5.7.4.6</a> </td></tr>
+<tr><td>prov:service-uri</td><td><a>Provenance Locator</a></td><td><a href="http://www.w3.org/TR/xmlschema-2/#anyURI">xsd:anyURI</a></td><td>Section <a href="#term-attribute-service-uri">5.7.4.7</a> </td></tr>
 </table>
 </div>
 
@@ -2920,6 +2946,7 @@
 </section>
 
 
+
 <section id="term-attribute-role">
 <h4>prov:role</h4>
 
@@ -2951,24 +2978,24 @@
 </div>
 
 <p>The following types are pre-defined in PROV, and are valid values for the <span class="name">prov:type</span> attribute.</p>
-<ul>
-<li><span class="name">prov:Plan</span></li>
-
-<li><span class="name">prov:SoftwareAgent</span></li>
-
-<li><span class="name">prov:Organization</span></li>
-
-<li><span class="name">prov:Person</span></li>
-
-<li><span class="name">prov:Bundle</span></li>
-
-<li><span class="name">prov:Collection</span></li>
-
-<li><span class="name">prov:Dictionary</span></li>
-
-<li><span class="name">prov:EmptyDictionary</span></li>
-
-</ul>
+
+
+<table class="thinborder" style="margin-left: auto; margin-right: auto;">
+<caption id="prov-dm-predefined-types">Table 7: PROV-DM Predefined Types</caption>
+<tr><td><b>Type</b></td><td><b>Specification</b></td><td><b>Core concept</b></td></tr>
+<tr><td style="border-width: 0px; "></td><td style="border-width: 0px; "></td><td style="border-width: 0px; "></td></tr>
+<tr><td><span class="name">prov:Bundle</span></td><td><a title="bundle">Section 5.5.1</a></td><td><a>Entity</a></td></tr>
+<tr><td><span class="name">prov:Collection</span></td><td><a title="collection">Section 5.6.1</a></td><td><a>Entity</a></td></tr>
+<tr><td><span class="name">prov:Dictionary</span></td><td><a title="dictionary">Section 5.6.2</a></td><td><a>Entity</a></td></tr>
+<tr><td><span class="name">prov:EmptyDictionary</span></td><td><a title="empty-dictionary">Section 5.6.2</a></td><td><a>Entity</a></td></tr>
+<tr><td><span class="name">prov:HadOriginalSource</span></td><td><a title="original source">Section 5.3.4</a></td><td><a>Derivation</a></td></tr>
+<tr><td><span class="name">prov:Organization</span></td><td><a title="organization">Section 5.2.1</a></td><td><a>Agent</a></td></tr>
+<tr><td><span class="name">prov:Person</span></td><td><a title="person">Section 5.2.1</a></td><td><a>Agent</a></td></tr>
+<tr><td><span class="name">prov:Plan</span></td> <td><a title="plan">Section 5.2.3</a></td><td><a>Entity</a></td></tr>
+<tr><td><span class="name">prov:SoftwareAgent</span></td><td><a title="software-agent">Section 5.2.1</a></td><td><a>Agent</a></td></tr>
+<tr><td><span class="name">prov:WasQuotedFrom</span></td><td><a title="Quotation">Section 5.3.3</a></td><td><a>Derivation</a></td></tr>
+<tr><td><span class="name">prov:WasRevisionOf</span></td><td><a title="Revision">Section 5.3.2</a></td><td><a>Derivation</a></td></tr>
+</table>
 
 </section>
 
@@ -2999,9 +3026,51 @@
 
 </section>
 
-
-
-
+<section id="term-attribute-provenance-uri">
+<h4>prov:provenance-uri</h4>
+
+
+<p> The attribute <dfn title="dfn-provenance-uri"><span class="name">prov:provenance-uri</span></dfn> provides
+  an OPTIONAL IRI in the context of a <a>Provenance Locator</a>;  when this IRI is dereferenced, it allows access to provenance descriptions. It is referred to as <a href="http://www.w3.org/TR/prov-aq/#dfn-provenance-uri">Provenance-URI</a> in [[PROV-AQ]]. </p>
+
+
+<p>The attributes <a href="#term-attribute-service-uri"><span class="name">prov:service-uri</span></a> 
+and
+<a href="#term-attribute-provenance-uri"><span class="name">prov:provenance-uri</span></a> are mutually exclusive.</p>
+
+
+<div class="anexample" id="anexample-provenance-uri">
+<p>According to the following provenance locator, provenance descriptions about <span class="name">ex:report1</span> can be found in bundle <span class="name">bob:bundle1</span>, which is available from the provenance service identified by the provided URI.</p>
+<pre class="codeexample"> 
+hasProvenanceIn(ex:report1, bob:bundle1, -, [ prov:provenance-uri="http://example.com/service"^xsd:anyURI ])
+</pre>
+</div>
+
+
+
+</section>
+
+
+<section id="term-attribute-service-uri">
+<h4>prov:service-uri</h4>
+
+<p> The attribute <dfn title="dfn-service-uri"><span class="name">prov:service-uri</span></dfn> provides
+  an OPTIONAL IRI in the context of a <a>Provenance Locator</a>; this IRI denotes a <a href="http://www.w3.org/TR/prov-aq/#dfn-provenance-service">provenance service</a> from which provenance can be retrieved. It is referred to as <a href="http://www.w3.org/TR/prov-aq/#dfn-service-uri">Service-URI</a> in [[PROV-AQ]].</p>
+
+
+<p>The attributes <a href="#term-attribute-service-uri"><span class="name">prov:service-uri</span></a> 
+and
+<a href="#term-attribute-provenance-uri"><span class="name">prov:provenance-uri</span></a> are mutually exclusive.</p>
+
+
+<div class="anexample" id="anexample-service-uri">
+<p>According to the following provenance locator, provenance descriptions about <span class="name">ex:report1</span> can be found in the resource identified by the provided URI.</p>
+<pre class="codeexample"> 
+hasProvenanceIn(ex:report1, [ prov:service=uri="http://example.com/some-provenance.pn"^xsd:anyURI ])
+</pre>
+</div>
+
+</section>
 
 
 
@@ -3026,10 +3095,10 @@
 
 
 <table   class="thinborder" style="margin-left: auto; margin-right: auto;">
-<caption id="prov-dm-data-types">Table 6: PROV-DM Data Types</caption>
+<caption id="prov-dm-data-types">Table 8: PROV-DM Data Types</caption>
 <tr><td><a href="http://www.w3.org/TR/xmlschema-2/#decimal">xsd:decimal</a></td> <td><a href="http://www.w3.org/TR/xmlschema-2/#double">xsd:double</a></td>  <td><a href="http://www.w3.org/TR/xmlschema-2/#dateTime">xsd:dateTime</a></td> </tr>
 <tr><td><a href="http://www.w3.org/TR/xmlschema-2/#integer">xsd:integer</a></td> <td><a href="http://www.w3.org/TR/xmlschema-2/#float">xsd:float</a></td><td><a href="http://www.w3.org/TR/2004/REC-rdf-concepts-20040210/#section-XMLLiteral">rdf:XMLLiteral</a></td>  </tr>
-<tr><td><a href="http://www.w3.org/TR/xmlschema-2/#nonNegativeInteger">xsd:nonNegativeInteger</a></td> <td><a href="http://www.w3.org/TR/xmlschema-2/#string">xsd:string</a></td> <td><a href="http://www.w3.org/TR/prov-n/#prod-QUALNAME">prov:QUALNAME</a></td> </tr>
+<tr><td><a href="http://www.w3.org/TR/xmlschema-2/#nonNegativeInteger">xsd:nonNegativeInteger</a></td> <td><a href="http://www.w3.org/TR/xmlschema-2/#string">xsd:string</a></td> <td><a href="http://www.w3.org/TR/prov-n/#prod-QUALIFIED_NAME">prov:QUALIFIED_NAME</a></td> </tr>
 <tr><td><a href="http://www.w3.org/TR/xmlschema-2/#nonPositiveInteger">xsd:nonPositiveInteger</a></td><td><a href="http://www.w3.org/TR/xmlschema-2/#normalizedString">xsd:normalizedString</a></td> <td></td></tr>
 <tr><td><a href="http://www.w3.org/TR/xmlschema-2/#positiveInteger">xsd:positiveInteger</a></td> <td><a href="http://www.w3.org/TR/xmlschema-2/#token">xsd:token</a></td> <td></td></tr>
 <tr><td><a href="http://www.w3.org/TR/xmlschema-2/#negativeInteger">xsd:negativeInteger</a></td> <td><a href="http://www.w3.org/TR/xmlschema-2/#language">xsd:language</a></td> <td></td></tr>
Binary file model/uml/component1.png has changed
--- a/model/uml/component1.svg	Thu May 24 21:48:41 2012 -0400
+++ b/model/uml/component1.svg	Thu May 24 21:51:11 2012 -0400
@@ -1,18 +1,18 @@
 <?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="840" stroke-miterlimit="10" stroke-opacity="0" shape-rendering="auto" fill="rgb(0,0,0)" stroke-dasharray="none" font-weight="normal" stroke-width="1" height="604" 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="801" stroke-miterlimit="10" stroke-opacity="0" shape-rendering="auto" fill="rgb(0,0,0)" stroke-dasharray="none" font-weight="normal" stroke-width="1" height="604" 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"
     ><clipPath clipPathUnits="userSpaceOnUse" id="clipPath1"
-      ><path d="M-7 -7 L620 -7 L620 172 L-7 172 L-7 -7 Z"
+      ><path d="M-7 -7 L695 -7 L695 189 L-7 189 L-7 -7 Z"
       /></clipPath
       ><clipPath clipPathUnits="userSpaceOnUse" id="clipPath2"
-      ><path d="M81.0445 27.5265 L81.0445 228.4751 L687.9205 228.4751 L687.9205 27.5265 Z"
+      ><path d="M82.6425 29.5072 L82.6425 226.497 L686.3494 226.497 L686.3494 29.5072 Z"
       /></clipPath
       ><clipPath clipPathUnits="userSpaceOnUse" id="clipPath3"
-      ><path d="M0 0 L0 161 L609 161 L609 0 Z"
+      ><path d="M0 0 L0 178 L684 178 L684 0 Z"
       /></clipPath
       ><clipPath clipPathUnits="userSpaceOnUse" id="clipPath4"
       ><path d="M-7 -7 L111 -7 L111 71 L-7 71 L-7 -7 Z"
@@ -99,7 +99,7 @@
       ><path d="M0 0 L314 0 L314 375 L0 375 L0 0 Z"
       /></clipPath
       ><clipPath clipPathUnits="userSpaceOnUse" id="clipPath32"
-      ><path d="M0 0 L203 0 L203 205 L0 205 L0 0 Z"
+      ><path d="M0 0 L175 0 L175 185 L0 185 L0 0 Z"
       /></clipPath
       ><clipPath clipPathUnits="userSpaceOnUse" id="clipPath33"
       ><path d="M0 0 L104 0 L104 293 L0 293 L0 0 Z"
@@ -132,56 +132,53 @@
       ><path d="M0 0 L104 0 L104 193 L0 193 L0 0 Z"
       /></clipPath
       ><clipPath clipPathUnits="userSpaceOnUse" id="clipPath43"
-      ><path d="M0 0 L104 0 L104 151 L0 151 L0 0 Z"
+      ><path d="M0 0 L189 0 L189 171 L0 171 L0 0 Z"
       /></clipPath
       ><clipPath clipPathUnits="userSpaceOnUse" id="clipPath44"
-      ><path d="M0 0 L189 0 L189 171 L0 171 L0 0 Z"
-      /></clipPath
-      ><clipPath clipPathUnits="userSpaceOnUse" id="clipPath45"
       ><path d="M-44 -14 L88 -14 L88 28 L-44 28 L-44 -14 Z"
       /></clipPath
+      ><clipPath clipPathUnits="userSpaceOnUse" id="clipPath45"
+      ><path d="M-111 -14 L222 -14 L222 28 L-111 28 L-111 -14 Z"
+      /></clipPath
       ><clipPath clipPathUnits="userSpaceOnUse" id="clipPath46"
-      ><path d="M-111 -14 L222 -14 L222 28 L-111 28 L-111 -14 Z"
+      ><path d="M-85 -14 L170 -14 L170 28 L-85 28 L-85 -14 Z"
       /></clipPath
       ><clipPath clipPathUnits="userSpaceOnUse" id="clipPath47"
-      ><path d="M-85 -14 L170 -14 L170 28 L-85 28 L-85 -14 Z"
+      ><path d="M-56 -14 L112 -14 L112 28 L-56 28 L-56 -14 Z"
       /></clipPath
       ><clipPath clipPathUnits="userSpaceOnUse" id="clipPath48"
-      ><path d="M-56 -14 L112 -14 L112 28 L-56 28 L-56 -14 Z"
+      ><path d="M-107 -14 L214 -14 L214 28 L-107 28 L-107 -14 Z"
       /></clipPath
       ><clipPath clipPathUnits="userSpaceOnUse" id="clipPath49"
-      ><path d="M-107 -14 L214 -14 L214 28 L-107 28 L-107 -14 Z"
+      ><path d="M-45 -14 L90 -14 L90 28 L-45 28 L-45 -14 Z"
       /></clipPath
       ><clipPath clipPathUnits="userSpaceOnUse" id="clipPath50"
-      ><path d="M-45 -14 L90 -14 L90 28 L-45 28 L-45 -14 Z"
+      ><path d="M-90 -14 L180 -14 L180 28 L-90 28 L-90 -14 Z"
       /></clipPath
       ><clipPath clipPathUnits="userSpaceOnUse" id="clipPath51"
-      ><path d="M-90 -14 L180 -14 L180 28 L-90 28 L-90 -14 Z"
+      ><path d="M-101 -14 L202 -14 L202 28 L-101 28 L-101 -14 Z"
       /></clipPath
       ><clipPath clipPathUnits="userSpaceOnUse" id="clipPath52"
-      ><path d="M-101 -14 L202 -14 L202 28 L-101 28 L-101 -14 Z"
+      ><path d="M-71 -14 L142 -14 L142 28 L-71 28 L-71 -14 Z"
       /></clipPath
       ><clipPath clipPathUnits="userSpaceOnUse" id="clipPath53"
-      ><path d="M-71 -14 L142 -14 L142 28 L-71 28 L-71 -14 Z"
+      ><path d="M-66 -14 L132 -14 L132 28 L-66 28 L-66 -14 Z"
       /></clipPath
       ><clipPath clipPathUnits="userSpaceOnUse" id="clipPath54"
-      ><path d="M-66 -14 L132 -14 L132 28 L-66 28 L-66 -14 Z"
+      ><path d="M-51 -14 L102 -14 L102 28 L-51 28 L-51 -14 Z"
       /></clipPath
       ><clipPath clipPathUnits="userSpaceOnUse" id="clipPath55"
-      ><path d="M-51 -14 L102 -14 L102 28 L-51 28 L-51 -14 Z"
-      /></clipPath
-      ><clipPath clipPathUnits="userSpaceOnUse" id="clipPath56"
       ><path d="M-55 -14 L110 -14 L110 28 L-55 28 L-55 -14 Z"
       /></clipPath
     ></defs
     ><g fill="white" text-rendering="geometricPrecision" fill-opacity="1" stroke-opacity="1" stroke="white"
-    ><rect x="0" width="840" height="604" y="0" stroke="none"
+    ><rect x="0" width="801" height="604" y="0" stroke="none"
     /></g
-    ><g font-size="11" transform="translate(112,51) matrix(1.0035,0,0,0.8012,-81.3282,-22.0542)" fill-opacity="0.498" fill="rgb(255,255,192)" text-rendering="geometricPrecision" color-rendering="optimizeQuality" font-family="sans-serif" stroke="rgb(255,255,192)" stroke-opacity="0.498"
+    ><g font-size="11" transform="translate(113,36) matrix(1.133,0,0,0.9036,-93.6339,-26.6627)" fill-opacity="0.498" fill="rgb(255,255,192)" text-rendering="geometricPrecision" color-rendering="optimizeQuality" font-family="sans-serif" stroke="rgb(255,255,192)" stroke-opacity="0.498"
     ><path d="M95 45 C239.75 45 529.25 45 674 45 C674 86.5 674 169.5 674 211 C529.25 211 239.75 211 95 211 C95 169.5 95 86.5 95 45 Z" clip-path="url(#clipPath2)" stroke="none"
     /></g
-    ><g font-size="11" stroke-linecap="butt" transform="matrix(1,0,0,1,112,51)" fill-opacity="1" fill="silver" text-rendering="geometricPrecision" color-rendering="optimizeQuality" font-family="sans-serif" stroke="silver" stroke-opacity="1"
-    ><path fill="none" d="M14 14 C159.25 14 449.75 14 595 14 C595 47.25 595 113.75 595 147 C449.75 147 159.25 147 14 147 C14 113.75 14 47.25 14 14 Z" clip-path="url(#clipPath3)"
+    ><g font-size="11" stroke-linecap="butt" transform="matrix(1,0,0,1,113,36)" fill-opacity="1" fill="silver" text-rendering="geometricPrecision" color-rendering="optimizeQuality" font-family="sans-serif" stroke="silver" stroke-opacity="1"
+    ><path fill="none" d="M14 14 C178 14 506 14 670 14 C670 51.5 670 126.5 670 164 C506 164 178 164 14 164 C14 126.5 14 51.5 14 14 Z" clip-path="url(#clipPath3)"
     /></g
     ><g font-size="11" transform="translate(260,540)" fill-opacity="1" fill="silver" text-rendering="geometricPrecision" font-family="sans-serif" stroke="silver" font-weight="bold" stroke-opacity="1"
     ><rect x="0" width="100" height="60" y="0" clip-path="url(#clipPath4)" stroke="none"
@@ -194,10 +191,8 @@
     ><text x="2" xml:space="preserve" y="13" clip-path="url(#clipPath5)" stroke="none"
       > id</text
       ><text x="2" xml:space="preserve" y="27" clip-path="url(#clipPath5)" stroke="none"
-      > time</text
-      ><text x="2" xml:space="preserve" y="41" clip-path="url(#clipPath5)" stroke="none"
       > attributes</text
-    ></g
+      ></g
     ><g font-size="11" transform="translate(260,540)" fill-opacity="1" fill="black" text-rendering="geometricPrecision" font-family="sans-serif" stroke="black" font-weight="bold" stroke-opacity="1"
     ><text x="14" xml:space="preserve" y="11" clip-path="url(#clipPath6)" stroke="none"
       >wasEndedBy</text
@@ -213,8 +208,6 @@
     ><text x="2" xml:space="preserve" y="13" clip-path="url(#clipPath5)" stroke="none"
       > id</text
       ><text x="2" xml:space="preserve" y="27" clip-path="url(#clipPath5)" stroke="none"
-      > time</text
-      ><text x="2" xml:space="preserve" y="41" clip-path="url(#clipPath5)" stroke="none"
       > attributes</text
     ></g
     ><g font-size="11" transform="translate(390,540)" fill-opacity="1" fill="black" text-rendering="geometricPrecision" font-family="sans-serif" stroke="black" font-weight="bold" stroke-opacity="1"
@@ -249,10 +242,8 @@
     ><text x="2" xml:space="preserve" y="13" clip-path="url(#clipPath11)" stroke="none"
       > id</text
       ><text x="2" xml:space="preserve" y="27" clip-path="url(#clipPath11)" stroke="none"
-      > time</text
-      ><text x="2" xml:space="preserve" y="41" clip-path="url(#clipPath11)" stroke="none"
       > attributes</text
-    ></g
+      ></g
     ><g font-size="11" transform="translate(180,330)" fill-opacity="1" fill="black" text-rendering="geometricPrecision" font-family="sans-serif" stroke="black" font-weight="bold" stroke-opacity="1"
     ><text x="25" xml:space="preserve" y="11" clip-path="url(#clipPath9)" stroke="none"
       >used</text
@@ -268,10 +259,8 @@
     ><text x="2" xml:space="preserve" y="13" clip-path="url(#clipPath13)" stroke="none"
       > id</text
       ><text x="2" xml:space="preserve" y="27" clip-path="url(#clipPath13)" stroke="none"
-      > time</text
-      ><text x="2" xml:space="preserve" y="41" clip-path="url(#clipPath13)" stroke="none"
       > attributes</text
-    ></g
+      ></g
     ><g font-size="11" transform="translate(310,330)" fill-opacity="1" fill="black" text-rendering="geometricPrecision" font-family="sans-serif" stroke="black" font-weight="bold" stroke-opacity="1"
     ><text x="12" xml:space="preserve" y="11" clip-path="url(#clipPath14)" stroke="none"
       >wasGeneratedBy</text
@@ -287,10 +276,8 @@
     ><text x="2" xml:space="preserve" y="13" clip-path="url(#clipPath13)" stroke="none"
       > id</text
       ><text x="2" xml:space="preserve" y="27" clip-path="url(#clipPath13)" stroke="none"
-      > time</text
-      ><text x="2" xml:space="preserve" y="41" clip-path="url(#clipPath13)" stroke="none"
       > attributes</text
-    ></g
+      ></g
     ><g font-size="11" transform="translate(470,330)" fill-opacity="1" fill="black" text-rendering="geometricPrecision" font-family="sans-serif" stroke="black" font-weight="bold" stroke-opacity="1"
     ><text x="10" xml:space="preserve" y="11" clip-path="url(#clipPath14)" stroke="none"
       >wasInvalidatedBy</text
@@ -336,12 +323,8 @@
     ><text x="2" xml:space="preserve" y="13" clip-path="url(#clipPath8)" stroke="none"
       > id</text
       ><text x="2" xml:space="preserve" y="27" clip-path="url(#clipPath8)" stroke="none"
-      > startTime</text
-      ><text x="2" xml:space="preserve" y="41" clip-path="url(#clipPath8)" stroke="none"
-      > endTime</text
-      ><text x="2" xml:space="preserve" y="55" clip-path="url(#clipPath8)" stroke="none"
       > attributes</text
-    ></g
+      ></g
     ><g font-size="11" transform="translate(591,79)" fill-opacity="1" fill="black" text-rendering="geometricPrecision" font-family="sans-serif" stroke="black" font-weight="bold" stroke-opacity="1"
     ><text x="18" xml:space="preserve" y="11" clip-path="url(#clipPath9)" stroke="none"
       >Activity</text
@@ -403,15 +386,15 @@
       /><line y2="327" fill="none" x1="50" clip-path="url(#clipPath31)" x2="62" y1="321"
       /><line y2="315" fill="none" x1="50" clip-path="url(#clipPath31)" x2="62" y1="321"
     /></g
-    ><g font-size="11" stroke-linecap="butt" transform="translate(601,-11)" 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(#clipPath32)" x2="50" y1="89"
-      /><line y2="50" fill="none" x1="50" clip-path="url(#clipPath32)" x2="149" y1="50"
-      /><line y2="151" fill="none" x1="149" clip-path="url(#clipPath32)" x2="149" y1="50"
-      /><line y2="151" fill="none" x1="149" clip-path="url(#clipPath32)" x2="70" y1="151"
-      /><line y2="157" fill="none" x1="70" clip-path="url(#clipPath32)" x2="82" y1="151"
-      /><line y2="145" fill="none" x1="70" clip-path="url(#clipPath32)" x2="82" y1="151"
+    ><g font-size="11" stroke-linecap="butt" transform="translate(601,9)" 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(#clipPath32)" x2="50" y1="69"
+      /><line y2="50" fill="none" x1="50" clip-path="url(#clipPath32)" x2="121" y1="50"
+      /><line y2="131" fill="none" x1="121" clip-path="url(#clipPath32)" x2="121" y1="50"
+      /><line y2="131" fill="none" x1="121" clip-path="url(#clipPath32)" x2="70" y1="131"
+      /><line y2="137" fill="none" x1="70" clip-path="url(#clipPath32)" x2="82" y1="131"
+      /><line y2="125" fill="none" x1="70" clip-path="url(#clipPath32)" x2="82" y1="131"
     /></g
-    ><g font-size="11" stroke-linecap="butt" transform="translate(670,90)" 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"
+    ><g font-size="11" stroke-linecap="butt" transform="translate(643,90)" 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="239" fill="none" x1="50" clip-path="url(#clipPath33)" x2="50" y1="50"
     /></g
     ><g font-size="11" stroke-linecap="butt" transform="translate(160,129)" fill-opacity="1" fill="black" text-rendering="geometricPrecision" font-family="sans-serif" stroke-linejoin="round" stroke="black" stroke-opacity="1"
@@ -461,72 +444,72 @@
     ><g font-size="11" stroke-linecap="butt" transform="translate(470,190)" 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="139" fill="none" x1="50" clip-path="url(#clipPath42)" x2="50" y1="50"
     /></g
-    ><g font-size="11" stroke-linecap="butt" transform="translate(98,162)" fill-opacity="1" fill="black" text-rendering="geometricPrecision" font-family="sans-serif" stroke-linejoin="round" stroke-dasharray="4" stroke="black" stroke-opacity="1"
-    ><line y2="50" fill="none" x1="50" clip-path="url(#clipPath43)" x2="50" y1="97"
+    ><g font-size="11" stroke-linecap="butt" transform="translate(98,150)" fill-opacity="1" fill="black" text-rendering="geometricPrecision" font-family="sans-serif" stroke-linejoin="round" stroke-dasharray="4" stroke="black" stroke-opacity="1"
+    ><line y2="50" fill="none" x1="50" clip-path="url(#clipPath26)" x2="50" y1="109"
     /></g
     ><g font-size="11" stroke-linecap="butt" transform="translate(185,340)" fill-opacity="1" fill="black" text-rendering="geometricPrecision" font-family="sans-serif" stroke-linejoin="round" stroke="black" stroke-opacity="1"
-    ><line y2="117" fill="none" x1="50" clip-path="url(#clipPath44)" x2="135" y1="50"
-      /><line y2="105" fill="none" x1="135" clip-path="url(#clipPath44)" x2="129" y1="117"
-      /><line y2="115" fill="none" x1="135" clip-path="url(#clipPath44)" x2="122" y1="117"
+    ><line y2="117" fill="none" x1="50" clip-path="url(#clipPath43)" x2="135" y1="50"
+      /><line y2="105" fill="none" x1="135" clip-path="url(#clipPath43)" x2="129" y1="117"
+      /><line y2="115" fill="none" x1="135" clip-path="url(#clipPath43)" x2="122" y1="117"
     /></g
     ><g font-size="11" transform="translate(197,401)" fill-opacity="1" fill="black" text-rendering="geometricPrecision" font-family="sans-serif" stroke="black" stroke-opacity="1"
-    ><text x="10" xml:space="preserve" y="11" clip-path="url(#clipPath45)" stroke="none"
+    ><text x="10" xml:space="preserve" y="11" clip-path="url(#clipPath44)" stroke="none"
       >time</text
     ></g
     ><g font-size="11" transform="translate(360,240)" fill-opacity="1" fill="black" text-rendering="geometricPrecision" font-family="sans-serif" stroke="black" stroke-opacity="1"
-    ><text x="10" xml:space="preserve" y="11" clip-path="url(#clipPath46)" stroke="none"
+    ><text x="10" xml:space="preserve" y="11" clip-path="url(#clipPath45)" stroke="none"
       >wasInvalidatedBy</text
     ></g
     ><g font-size="11" transform="translate(360,280)" fill-opacity="1" fill="black" text-rendering="geometricPrecision" font-family="sans-serif" stroke="black" stroke-opacity="1"
-    ><text x="10" xml:space="preserve" y="11" clip-path="url(#clipPath47)" stroke="none"
+    ><text x="10" xml:space="preserve" y="11" clip-path="url(#clipPath46)" stroke="none"
       >wasEndedBy</text
     ></g
     ><g font-size="11" transform="translate(167,282)" 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(#clipPath48)" stroke="none"
+    ><text x="9" xml:space="preserve" y="11" clip-path="url(#clipPath47)" stroke="none"
       >trigger</text
     ></g
     ><g font-size="11" transform="translate(368,95)" 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(#clipPath49)" stroke="none"
+    ><text x="9" xml:space="preserve" y="11" clip-path="url(#clipPath48)" stroke="none"
       >wasGeneratedBy</text
     ></g
     ><g font-size="11" transform="translate(370,135)" 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(#clipPath50)" stroke="none"
+    ><text x="9" xml:space="preserve" y="11" clip-path="url(#clipPath49)" stroke="none"
       >used</text
     ></g
     ><g font-size="11" transform="translate(360,260)" 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(#clipPath51)" stroke="none"
+    ><text x="9" xml:space="preserve" y="11" clip-path="url(#clipPath50)" stroke="none"
       >wasStartedBy</text
     ></g
     ><g font-size="11" transform="translate(200,260)" 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(#clipPath48)" stroke="none"
+    ><text x="9" xml:space="preserve" y="11" clip-path="url(#clipPath47)" stroke="none"
       >trigger</text
     ></g
-    ><g font-size="11" transform="translate(735,150)" fill-opacity="1" fill="black" text-rendering="geometricPrecision" font-family="sans-serif" stroke="black" stroke-opacity="1"
-    ><text x="10" xml:space="preserve" y="11" clip-path="url(#clipPath52)" stroke="none"
+    ><g font-size="11" transform="translate(689,147)" fill-opacity="1" fill="black" text-rendering="geometricPrecision" font-family="sans-serif" stroke="black" stroke-opacity="1"
+    ><text x="10" xml:space="preserve" y="11" clip-path="url(#clipPath51)" stroke="none"
       >wasInformedBy</text
     ></g
     ><g font-size="11" transform="translate(510,430)" fill-opacity="1" fill="black" text-rendering="geometricPrecision" font-family="sans-serif" stroke="black" stroke-opacity="1"
-    ><text x="10" xml:space="preserve" y="11" clip-path="url(#clipPath53)" stroke="none"
+    ><text x="10" xml:space="preserve" y="11" clip-path="url(#clipPath52)" stroke="none"
       >startTime</text
     ></g
     ><g font-size="11" transform="translate(514,459)" 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(#clipPath54)" stroke="none"
+    ><text x="9" xml:space="preserve" y="11" clip-path="url(#clipPath53)" stroke="none"
       >endTime</text
     ></g
     ><g font-size="11" transform="translate(580,486)" fill-opacity="1" fill="black" text-rendering="geometricPrecision" font-family="sans-serif" stroke="black" stroke-opacity="1"
-    ><text x="10" xml:space="preserve" y="11" clip-path="url(#clipPath55)" stroke="none"
+    ><text x="10" xml:space="preserve" y="11" clip-path="url(#clipPath54)" stroke="none"
       >ender</text
     ></g
     ><g font-size="11" transform="translate(580,520)" 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(#clipPath56)" stroke="none"
+    ><text x="9" xml:space="preserve" y="11" clip-path="url(#clipPath55)" stroke="none"
       >starter</text
     ></g
     ><g font-size="11" transform="translate(413,408)" fill-opacity="1" fill="black" text-rendering="geometricPrecision" font-family="sans-serif" stroke="black" stroke-opacity="1"
-    ><text x="10" xml:space="preserve" y="11" clip-path="url(#clipPath45)" stroke="none"
+    ><text x="10" xml:space="preserve" y="11" clip-path="url(#clipPath44)" stroke="none"
       >time</text
     ></g
     ><g font-size="11" transform="translate(355,398)" fill-opacity="1" fill="black" text-rendering="geometricPrecision" font-family="sans-serif" stroke="black" stroke-opacity="1"
-    ><text x="10" xml:space="preserve" y="11" clip-path="url(#clipPath45)" stroke="none"
+    ><text x="10" xml:space="preserve" y="11" clip-path="url(#clipPath44)" stroke="none"
       >time</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)"
--- a/model/uml/component1.xmi	Thu May 24 21:48:41 2012 -0400
+++ b/model/uml/component1.xmi	Thu May 24 21:51:11 2012 -0400
@@ -5170,7 +5170,7 @@
 								<property htmlValue="" name="documentation" type="htmlString" value=""/>
 								<property name="pmAuthor" type="string" value="lavm"/>
 								<property name="pmCreateDateTime" type="string" value="1337241303538"/>
-								<property name="pmLastModified" type="string" value="1337719681272"/>
+								<property name="pmLastModified" type="string" value="1337875861982"/>
 								<property name="qualityScore" type="int" value="-1"/>
 							</properties>
 							<vpumlChildModelRefs>
@@ -5197,7 +5197,6 @@
 								<modelRef value="Uf5tBuyCiu1SNwgY"/>
 								<modelRef value="CNrtBuyCiu1SNwgz"/>
 								<modelRef value="CqftBuyCiu1SNwhD"/>
-								<modelRef value="vVSGjuyCiu1SNwm4"/>
 								<modelRef value="fOWGjuyCiu1SNwnM"/>
 								<modelRef value="t7OGjuyCiu1SNwnU"/>
 								<modelRef value="1YFGjuyCiu1SNwnk"/>
@@ -5216,6 +5215,12 @@
 								<modelRef value="gCsSbuyCiu1SNxFe"/>
 								<modelRef value="MMoybuyCiu1SNxF6"/>
 								<modelRef value="QjBybuyCiu1SNxGg"/>
+								<modelRef value="m4aBHuyCiu1SNxLY"/>
+								<modelRef value="ghXBHuyCiu1SNxMM"/>
+								<modelRef value="SA4hHuyCiu1SNxMa"/>
+								<modelRef value="pKq8nuyCiu1SNxPl"/>
+								<modelRef value="eWBu3uyCiu1SNxXO"/>
+								<modelRef value="1MC5_uyCiu1SNxbJ"/>
 							</vpumlChildModelRefs>
 						</vpumlModel>
 						<vpumlModel id="Bu5UWuyEwTiAAgSF" modelType="ModelRelationshipContainer">
@@ -5225,7 +5230,7 @@
 								<property htmlValue="" name="documentation" type="htmlString" value=""/>
 								<property name="pmAuthor" type="string" value="lavm"/>
 								<property name="pmCreateDateTime" type="string" value="1337247561568"/>
-								<property name="pmLastModified" type="string" value="1337719681274"/>
+								<property name="pmLastModified" type="string" value="1337769103088"/>
 								<property name="qualityScore" type="int" value="-1"/>
 							</properties>
 							<vpumlChildModelRefs>
@@ -5244,6 +5249,9 @@
 								<modelRef value="FMPxzuyCiu1SNw08"/>
 								<modelRef value="eyqRLuyCiu1SNw4b"/>
 								<modelRef value="fpOybuyCiu1SNxGW"/>
+								<modelRef value="Lu.BHuyCiu1SNxLr"/>
+								<modelRef value="XpGhHuyCiu1SNxM0"/>
+								<modelRef value="P7f8nuyCiu1SNxQU"/>
 							</vpumlChildModelRefs>
 						</vpumlModel>
 						<vpumlModel id="XhLbWuyEwTiAAgjM" modelType="ModelRelationshipContainer">
@@ -5253,7 +5261,7 @@
 								<property htmlValue="" name="documentation" type="htmlString" value=""/>
 								<property name="pmAuthor" type="string" value="lavm"/>
 								<property name="pmCreateDateTime" type="string" value="1337259149434"/>
-								<property name="pmLastModified" type="string" value="1337690593801"/>
+								<property name="pmLastModified" type="string" value="1337805539425"/>
 								<property name="qualityScore" type="int" value="-1"/>
 							</properties>
 							<vpumlChildModelRefs>
@@ -5264,6 +5272,9 @@
 								<modelRef value="gt_hLuyCiu1SNw4A"/>
 								<modelRef value="3iRJLuyCiu1SNw6t"/>
 								<modelRef value="ouFJLuyCiu1SNw6_"/>
+								<modelRef value="BHNW3uyCiu1SNxT2"/>
+								<modelRef value="tJTW3uyCiu1SNxT."/>
+								<modelRef value="oCw23uyCiu1SNxUT"/>
 							</vpumlChildModelRefs>
 						</vpumlModel>
 						<vpumlModel id="Ul4OHuyCiu1SNxIB" modelType="ModelRelationshipContainer">
@@ -5294,7 +5305,7 @@
 								</ownedMember>
 								<ownedMember from="afB2HuyCiu1SNxHe" to="yr2uHuyCiu1SNxJW" xmi:id="qlVuHuyCiu1SNxJg" xmi:type="anchor">
 									<xmi:Extension extender="Visual Paradigm for UML">
-										<qualityScore value="-1"/>
+										<qualityScore value="100"/>
 									</xmi:Extension>
 								</ownedMember>
 							</vpumlChildModels>
@@ -6008,7 +6019,7 @@
 						</taggedValue>
 					</xmi:Extension>
 				</association>
-				<associationClass from="f1p0WuyEwTiAAgTE" to="_i1UWuyEwTiAAgSK" xmi:id="9G50WuyEwTiAAgTM"/>
+				<associationClass from="f1p0WuyEwTiAAgTE" name="" to="_i1UWuyEwTiAAgSK" xmi:id="9G50WuyEwTiAAgTM"/>
 				<businessModel xmi:value="false"/>
 				<qualityScore value="92"/>
 				<qualityReason value="1&#9;1&#10;2&#9;2"/>
@@ -6372,7 +6383,8 @@
 								<qualityScore value="-1"/>
 							</xmi:Extension>
 						</qualifier>
-						<qualityScore value="-1"/>
+						<qualityScore value="95"/>
+						<qualityReason value="1&#9;1"/>
 					</xmi:Extension>
 				</ownedAttribute>
 				<ownedAttribute aggregation="none" association="iwsbWuyEwTiAAgiT" isDerived="false" type="m6xjmuyEwTiAAgLk" xmi:id="H7xbWuyEwTiAAgi3" xmi:type="uml:Property">
@@ -6466,6 +6478,30 @@
 						<qualityReason value="1&#9;1"/>
 					</xmi:Extension>
 				</ownedAttribute>
+				<ownedAttribute aggregation="none" association="Ftn8nuyCiu1SNxQP" isDerived="false" type="m6xjmuyEwTiAAgLk" xmi:id="VKq8nuyCiu1SNxPo" xmi:type="uml:Property">
+					<xmi:Extension extender="Visual Paradigm for UML">
+						<associationEnd/>
+						<qualifier name="" xmi:id="VKq8nuyCiu1SNxPp" xmi:type="qualifier">
+							<xmi:Extension extender="Visual Paradigm for UML">
+								<qualityScore value="-1"/>
+							</xmi:Extension>
+						</qualifier>
+						<qualityScore value="95"/>
+						<qualityReason value="1&#9;1"/>
+					</xmi:Extension>
+				</ownedAttribute>
+				<ownedAttribute aggregation="none" association="Ftn8nuyCiu1SNxQP" isDerived="false" isNavigable="true" type="m6xjmuyEwTiAAgLk" xmi:id="pKq8nuyCiu1SNxPm" xmi:type="uml:Property">
+					<xmi:Extension extender="Visual Paradigm for UML">
+						<associationEnd/>
+						<qualifier name="" xmi:id="VKq8nuyCiu1SNxPn" xmi:type="qualifier">
+							<xmi:Extension extender="Visual Paradigm for UML">
+								<qualityScore value="-1"/>
+							</xmi:Extension>
+						</qualifier>
+						<qualityScore value="95"/>
+						<qualityReason value="1&#9;1"/>
+					</xmi:Extension>
+				</ownedAttribute>
 			</ownedMember>
 			<ownedMember isAbstract="false" isActive="false" isLeaf="false" name="Activity" visibility="public" xmi:id="vTljmuyEwTiAAgLp" xmi:type="uml:Class">
 				<xmi:Extension extender="Visual Paradigm for UML">
@@ -6484,15 +6520,13 @@
 					</xmi:Extension>
 					<lowerValue value="1" xmi:id="G3u4WuyEwTiAAgPd_multiplicity_lowerValue" xmi:type="uml:LiteralString"/>
 				</ownedAttribute>
-				<ownedAttribute aggregation="none" isDerived="false" name="startTime" ownerScope="instance" xmi:id="fa44WuyEwTiAAgPN" xmi:type="uml:Property">
+				<ownedAttribute aggregation="none" isDerived="false" name="startTime" ownerScope="instance" xmi:id="xhK1_uyCiu1SNxcP" xmi:type="uml:Property">
 					<xmi:Extension extender="Visual Paradigm for UML">
 						<attribute/>
 						<isVisble xmi:value="true"/>
 						<qualityScore value="97"/>
 						<qualityReason value="2&#9;2"/>
 					</xmi:Extension>
-					<lowerValue value="0" xmi:id="fa44WuyEwTiAAgPN_multiplicity_lowerValue" xmi:type="uml:LiteralString"/>
-					<upperValue value="1" xmi:id="fa44WuyEwTiAAgPN_multiplicity_upperValue" xmi:type="uml:LiteralString"/>
 				</ownedAttribute>
 				<ownedAttribute aggregation="none" isDerived="false" name="endTime" ownerScope="instance" xmi:id="mJi4WuyEwTiAAgPP" xmi:type="uml:Property">
 					<xmi:Extension extender="Visual Paradigm for UML">
@@ -6604,9 +6638,9 @@
 					</xmi:Extension>
 				</ownedAttribute>
 			</ownedMember>
-			<ownedComment body="Classes and associations&#10;within this rectangle belong to PROV core" name="" xmi:id="afB2HuyCiu1SNxHe" xmi:type="uml:Comment">
-				<xmi:Extension extender="Visual Paradigm for UML">
-					<htmlValue value="&lt;head&gt;&#10;    &lt;style type=&quot;text/css&quot;&gt;&#10;      &lt;!--&#10;        body { color: #000000; font-family: Dialog; font-size: 11px }&#10;      --&gt;&#10;    &lt;/style&gt;&#10;    &#10;  &lt;/head&gt;&#10;  &lt;body&gt;&#10;    &lt;p&gt;&#10;      Classes and associations&#10;    &lt;/p&gt;&#10;    &lt;p&gt;&#10;      within this rectangle belong to PROV core&#10;    &lt;/p&gt;&#10;  &lt;/body&gt;"/>
+			<ownedComment body="Classes and associations&#10;within this area belong to PROV core" name="" xmi:id="afB2HuyCiu1SNxHe" xmi:type="uml:Comment">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<htmlValue value="&lt;head&gt;&#10;    &lt;style type=&quot;text/css&quot;&gt;&#10;      &lt;!--&#10;        body { color: #000000; font-family: Dialog; font-size: 11px }&#10;      --&gt;&#10;    &lt;/style&gt;&#10;    &#10;  &lt;/head&gt;&#10;  &lt;body&gt;&#10;    &lt;p&gt;&#10;      Classes and associations&#10;    &lt;/p&gt;&#10;    &lt;p&gt;&#10;      within this area belong to PROV core&#10;    &lt;/p&gt;&#10;  &lt;/body&gt;"/>
 					<type value="NOTE"/>
 					<qualityScore value="100"/>
 				</xmi:Extension>
@@ -6623,8 +6657,8 @@
 							<property htmlValue="" name="documentation" type="htmlString" value=""/>
 							<property name="pmAuthor" type="string" value="lavm"/>
 							<property name="pmCreateDateTime" type="string" value="1337755811155"/>
-							<property name="pmLastModified" type="string" value="1337755909232"/>
-							<property name="qualityScore" type="int" value="-1"/>
+							<property name="pmLastModified" type="string" value="1337756066660"/>
+							<property name="qualityScore" type="int" value="100"/>
 						</properties>
 					</vpumlModel>
 				</vpumlChildModels>
@@ -6670,6 +6704,7 @@
 					<businessModel xmi:value="false"/>
 					<qualityScore value="97"/>
 					<qualityReason value="2&#9;2"/>
+					<appliedStereotype xmi:value="Class_prov:type_id"/>
 				</xmi:Extension>
 				<memberEnd xmi:idref="77xbWuyEwTiAAgi1"/>
 				<memberEnd xmi:idref="H7xbWuyEwTiAAgi3"/>
@@ -6688,6 +6723,7 @@
 					<businessModel xmi:value="false"/>
 					<qualityScore value="97"/>
 					<qualityReason value="2&#9;2"/>
+					<appliedStereotype xmi:value="Class_prov:type_id"/>
 				</xmi:Extension>
 				<memberEnd xmi:idref="gi8U.uyCiu1SNwYn"/>
 				<memberEnd xmi:idref="gi8U.uyCiu1SNwYp"/>
@@ -6706,6 +6742,7 @@
 					<businessModel xmi:value="false"/>
 					<qualityScore value="97"/>
 					<qualityReason value="2&#9;2"/>
+					<appliedStereotype xmi:value="Class_prov:type_id"/>
 				</xmi:Extension>
 				<memberEnd xmi:idref="D2RU.uyCiu1SNwZB"/>
 				<memberEnd xmi:idref="D2RU.uyCiu1SNwZD"/>
@@ -6715,6 +6752,19 @@
 					</xmi:Extension>
 				</generalization>
 			</ownedMember>
+			<ownedMember isAbstract="false" isActive="false" isLeaf="false" name="tracedTo" visibility="public" xmi:id="Ftn8nuyCiu1SNxQP" xmi:type="uml:AssociationClass">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<isRoot xmi:value="false"/>
+					<modelType value="Class"/>
+					<association isAbstract="false" isDerived="false" isLeaf="false" name="tracedTo" xmi:id="pKq8nuyCiu1SNxPl"/>
+					<associationClass from="pKq8nuyCiu1SNxPl" to="Ftn8nuyCiu1SNxQP" xmi:id="P7f8nuyCiu1SNxQU"/>
+					<businessModel xmi:value="false"/>
+					<qualityScore value="97"/>
+					<qualityReason value="2&#9;2"/>
+				</xmi:Extension>
+				<memberEnd xmi:idref="pKq8nuyCiu1SNxPm"/>
+				<memberEnd xmi:idref="VKq8nuyCiu1SNxPo"/>
+			</ownedMember>
 		</ownedMember>
 		<ownedMember isAbstract="false" isLeaf="false" name="Essentials" visibility="public" xmi:id="n4FNBuyCiu1SNwd4" xmi:type="uml:Package">
 			<xmi:Extension extender="Visual Paradigm for UML">
@@ -6849,6 +6899,7 @@
 					<businessModel xmi:value="false"/>
 					<qualityScore value="97"/>
 					<qualityReason value="2&#9;2"/>
+					<appliedStereotype xmi:value="Class_prov:type_id"/>
 				</xmi:Extension>
 				<generalization general="m6xjmuyEwTiAAgLk" xmi:id="cELRzuyCiu1SNwzd" xmi:type="uml:Generalization">
 					<xmi:Extension extender="Visual Paradigm for UML">
@@ -6916,6 +6967,48 @@
 					</xmi:Extension>
 				</ownedAttribute>
 			</ownedMember>
+			<ownedMember isAbstract="false" isActive="false" isLeaf="false" name="SoftwareAgent" visibility="public" xmi:id="4V6W3uyCiu1SNxTH" xmi:type="uml:Class">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<isRoot xmi:value="false"/>
+					<modelType value="Class"/>
+					<businessModel xmi:value="false"/>
+					<qualityScore value="-2"/>
+					<appliedStereotype xmi:value="Class_prov:type_id"/>
+				</xmi:Extension>
+				<generalization general="2VbNBuyCiu1SNwe6" xmi:id="tJTW3uyCiu1SNxT." xmi:type="uml:Generalization">
+					<xmi:Extension extender="Visual Paradigm for UML">
+						<qualityScore value="100"/>
+					</xmi:Extension>
+				</generalization>
+			</ownedMember>
+			<ownedMember isAbstract="false" isActive="false" isLeaf="false" name="Person" visibility="public" xmi:id="RB2W3uyCiu1SNxTP" xmi:type="uml:Class">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<isRoot xmi:value="false"/>
+					<modelType value="Class"/>
+					<businessModel xmi:value="false"/>
+					<qualityScore value="-2"/>
+					<appliedStereotype xmi:value="Class_prov:type_id"/>
+				</xmi:Extension>
+				<generalization general="2VbNBuyCiu1SNwe6" xmi:id="BHNW3uyCiu1SNxT2" xmi:type="uml:Generalization">
+					<xmi:Extension extender="Visual Paradigm for UML">
+						<qualityScore value="100"/>
+					</xmi:Extension>
+				</generalization>
+			</ownedMember>
+			<ownedMember isAbstract="false" isActive="false" isLeaf="false" name="Organization" visibility="public" xmi:id="zuuW3uyCiu1SNxTU" xmi:type="uml:Class">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<isRoot xmi:value="false"/>
+					<modelType value="Class"/>
+					<businessModel xmi:value="false"/>
+					<qualityScore value="-2"/>
+					<appliedStereotype xmi:value="Class_prov:type_id"/>
+				</xmi:Extension>
+				<generalization general="2VbNBuyCiu1SNwe6" xmi:id="oCw23uyCiu1SNxUT" xmi:type="uml:Generalization">
+					<xmi:Extension extender="Visual Paradigm for UML">
+						<qualityScore value="100"/>
+					</xmi:Extension>
+				</generalization>
+			</ownedMember>
 		</ownedMember>
 		<ownedMember name="primitive" xmi:id="Class_primitive_id" xmi:type="uml:Stereotype">
 			<xmi:Extension extender="Visual Paradigm for UML">
@@ -6951,6 +7044,7 @@
 					<businessModel xmi:value="false"/>
 					<qualityScore value="97"/>
 					<qualityReason value="2&#9;2"/>
+					<appliedStereotype xmi:value="Class_prov:type_id"/>
 				</xmi:Extension>
 				<generalization general="m6xjmuyEwTiAAgLk" xmi:id="gt_hLuyCiu1SNw4A" xmi:type="uml:Generalization">
 					<xmi:Extension extender="Visual Paradigm for UML">
@@ -7030,6 +7124,7 @@
 					<businessModel xmi:value="false"/>
 					<qualityScore value="97"/>
 					<qualityReason value="2&#9;2"/>
+					<appliedStereotype xmi:value="Class_prov:type_id"/>
 				</xmi:Extension>
 				<generalization general="m6xjmuyEwTiAAgLk" xmi:id="3iRJLuyCiu1SNw6t" xmi:type="uml:Generalization">
 					<xmi:Extension extender="Visual Paradigm for UML">
@@ -7044,6 +7139,7 @@
 					<businessModel xmi:value="false"/>
 					<qualityScore value="97"/>
 					<qualityReason value="2&#9;2"/>
+					<appliedStereotype xmi:value="Class_prov:type_id"/>
 				</xmi:Extension>
 				<generalization general="Jc2JLuyCiu1SNw6o" xmi:id="ouFJLuyCiu1SNw6_" xmi:type="uml:Generalization">
 					<xmi:Extension extender="Visual Paradigm for UML">
@@ -7073,6 +7169,40 @@
 						<qualityReason value="1&#9;1"/>
 					</xmi:Extension>
 				</ownedAttribute>
+				<ownedAttribute aggregation="none" association="Oa6BHuyCiu1SNxLh" isDerived="false" type="L9xJLuyCiu1SNw61" xmi:id="m4aBHuyCiu1SNxLb" xmi:type="uml:Property">
+					<xmi:Extension extender="Visual Paradigm for UML">
+						<associationEnd/>
+						<qualifier name="" xmi:id="m4aBHuyCiu1SNxLc" xmi:type="qualifier">
+							<xmi:Extension extender="Visual Paradigm for UML">
+								<qualityScore value="-1"/>
+							</xmi:Extension>
+						</qualifier>
+						<qualityScore value="95"/>
+						<qualityReason value="1&#9;1"/>
+					</xmi:Extension>
+				</ownedAttribute>
+				<ownedAttribute aggregation="none" association="Oa6BHuyCiu1SNxLh" isDerived="false" isNavigable="true" type="L9xJLuyCiu1SNw61" xmi:id="m4aBHuyCiu1SNxLZ" xmi:type="uml:Property">
+					<xmi:Extension extender="Visual Paradigm for UML">
+						<associationEnd/>
+						<qualifier name="" xmi:id="m4aBHuyCiu1SNxLa" xmi:type="qualifier">
+							<xmi:Extension extender="Visual Paradigm for UML">
+								<qualityScore value="-1"/>
+							</xmi:Extension>
+						</qualifier>
+						<qualityScore value="-1"/>
+					</xmi:Extension>
+				</ownedAttribute>
+				<ownedAttribute aggregation="none" association="ThihHuyCiu1SNxMu" isDerived="false" type="h_YSbuyCiu1SNxFP" xmi:id="SA4hHuyCiu1SNxMb" xmi:type="uml:Property">
+					<xmi:Extension extender="Visual Paradigm for UML">
+						<associationEnd/>
+						<qualifier name="" xmi:id="SA4hHuyCiu1SNxMc" xmi:type="qualifier">
+							<xmi:Extension extender="Visual Paradigm for UML">
+								<qualityScore value="-1"/>
+							</xmi:Extension>
+						</qualifier>
+						<qualityScore value="-1"/>
+					</xmi:Extension>
+				</ownedAttribute>
 			</ownedMember>
 			<ownedMember isAbstract="false" isActive="false" isLeaf="false" name="Key" visibility="public" xmi:id="Xw_ibuyCiu1SNxFK" xmi:type="uml:Class">
 				<xmi:Extension extender="Visual Paradigm for UML">
@@ -7092,12 +7222,23 @@
 					<qualityScore value="97"/>
 					<qualityReason value="2&#9;2"/>
 				</xmi:Extension>
+				<ownedAttribute aggregation="none" association="ThihHuyCiu1SNxMu" isDerived="false" isNavigable="true" type="L9xJLuyCiu1SNw61" xmi:id="SA4hHuyCiu1SNxMd" xmi:type="uml:Property">
+					<xmi:Extension extender="Visual Paradigm for UML">
+						<associationEnd/>
+						<qualifier name="" xmi:id="SA4hHuyCiu1SNxMe" xmi:type="qualifier">
+							<xmi:Extension extender="Visual Paradigm for UML">
+								<qualityScore value="-1"/>
+							</xmi:Extension>
+						</qualifier>
+						<qualityScore value="-1"/>
+					</xmi:Extension>
+				</ownedAttribute>
 			</ownedMember>
-			<ownedMember isAbstract="false" isActive="false" isLeaf="false" name="derivedByInsertionFrom" visibility="public" xmi:id="YmaybuyCiu1SNxGR" xmi:type="uml:AssociationClass">
+			<ownedMember isAbstract="false" isActive="false" isLeaf="false" name="insertion" visibility="public" xmi:id="YmaybuyCiu1SNxGR" xmi:type="uml:AssociationClass">
 				<xmi:Extension extender="Visual Paradigm for UML">
 					<isRoot xmi:value="false"/>
 					<modelType value="Class"/>
-					<association isAbstract="false" isDerived="false" isLeaf="false" name="derivedByInsertionFrom" xmi:id="MMoybuyCiu1SNxF6"/>
+					<association isAbstract="false" isDerived="false" isLeaf="false" name="insertion" xmi:id="MMoybuyCiu1SNxF6"/>
 					<associationClass from="MMoybuyCiu1SNxF6" to="YmaybuyCiu1SNxGR" xmi:id="fpOybuyCiu1SNxGW"/>
 					<businessModel xmi:value="false"/>
 					<qualityScore value="97"/>
@@ -7105,6 +7246,80 @@
 				</xmi:Extension>
 				<memberEnd xmi:idref="MMoybuyCiu1SNxF7"/>
 				<memberEnd xmi:idref="sMoybuyCiu1SNxF9"/>
+				<ownedAttribute aggregation="none" isDerived="false" name="id" ownerScope="instance" xmi:id="8Bp9HuyCiu1SNxNI" xmi:type="uml:Property">
+					<xmi:Extension extender="Visual Paradigm for UML">
+						<attribute/>
+						<isVisble xmi:value="true"/>
+						<qualityScore value="97"/>
+						<qualityReason value="2&#9;2"/>
+					</xmi:Extension>
+				</ownedAttribute>
+				<ownedAttribute aggregation="none" isDerived="false" name="attributes" ownerScope="instance" xmi:id="gq59HuyCiu1SNxNK" xmi:type="uml:Property">
+					<xmi:Extension extender="Visual Paradigm for UML">
+						<attribute/>
+						<isVisble xmi:value="true"/>
+						<qualityScore value="97"/>
+						<qualityReason value="2&#9;2"/>
+					</xmi:Extension>
+				</ownedAttribute>
+			</ownedMember>
+			<ownedMember isAbstract="false" isActive="false" isLeaf="false" name="removal" visibility="public" xmi:id="Oa6BHuyCiu1SNxLh" xmi:type="uml:AssociationClass">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<isRoot xmi:value="false"/>
+					<modelType value="Class"/>
+					<association isAbstract="false" isDerived="false" isLeaf="false" name="removal" xmi:id="m4aBHuyCiu1SNxLY"/>
+					<associationClass from="m4aBHuyCiu1SNxLY" to="Oa6BHuyCiu1SNxLh" xmi:id="Lu.BHuyCiu1SNxLr"/>
+					<businessModel xmi:value="false"/>
+					<qualityScore value="97"/>
+					<qualityReason value="2&#9;2"/>
+				</xmi:Extension>
+				<memberEnd xmi:idref="m4aBHuyCiu1SNxLZ"/>
+				<memberEnd xmi:idref="m4aBHuyCiu1SNxLb"/>
+				<ownedAttribute aggregation="none" isDerived="false" name="id" ownerScope="instance" xmi:id="KV99HuyCiu1SNxNW" xmi:type="uml:Property">
+					<xmi:Extension extender="Visual Paradigm for UML">
+						<attribute/>
+						<isVisble xmi:value="true"/>
+						<qualityScore value="97"/>
+						<qualityReason value="2&#9;2"/>
+					</xmi:Extension>
+				</ownedAttribute>
+				<ownedAttribute aggregation="none" isDerived="false" name="attributes" ownerScope="instance" xmi:id="Yyj9HuyCiu1SNxNY" xmi:type="uml:Property">
+					<xmi:Extension extender="Visual Paradigm for UML">
+						<attribute/>
+						<isVisble xmi:value="true"/>
+						<qualityScore value="97"/>
+						<qualityReason value="2&#9;2"/>
+					</xmi:Extension>
+				</ownedAttribute>
+			</ownedMember>
+			<ownedMember isAbstract="false" isActive="false" isLeaf="false" name="memberOf" visibility="public" xmi:id="ThihHuyCiu1SNxMu" xmi:type="uml:AssociationClass">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<isRoot xmi:value="false"/>
+					<modelType value="Class"/>
+					<association isAbstract="false" isDerived="false" isLeaf="false" name="memberOf" xmi:id="SA4hHuyCiu1SNxMa"/>
+					<associationClass from="SA4hHuyCiu1SNxMa" to="ThihHuyCiu1SNxMu" xmi:id="XpGhHuyCiu1SNxM0"/>
+					<businessModel xmi:value="false"/>
+					<qualityScore value="97"/>
+					<qualityReason value="2&#9;2"/>
+				</xmi:Extension>
+				<memberEnd xmi:idref="SA4hHuyCiu1SNxMb"/>
+				<memberEnd xmi:idref="SA4hHuyCiu1SNxMd"/>
+				<ownedAttribute aggregation="none" isDerived="false" name="id" ownerScope="instance" xmi:id="cM19HuyCiu1SNxNO" xmi:type="uml:Property">
+					<xmi:Extension extender="Visual Paradigm for UML">
+						<attribute/>
+						<isVisble xmi:value="true"/>
+						<qualityScore value="97"/>
+						<qualityReason value="2&#9;2"/>
+					</xmi:Extension>
+				</ownedAttribute>
+				<ownedAttribute aggregation="none" isDerived="false" name="attributes" ownerScope="instance" xmi:id="UXN9HuyCiu1SNxNQ" xmi:type="uml:Property">
+					<xmi:Extension extender="Visual Paradigm for UML">
+						<attribute/>
+						<isVisble xmi:value="true"/>
+						<qualityScore value="97"/>
+						<qualityReason value="2&#9;2"/>
+					</xmi:Extension>
+				</ownedAttribute>
 			</ownedMember>
 		</ownedMember>
 		<ownedMember name="type" xmi:id="Class_type_id" xmi:type="uml:Stereotype">
@@ -7119,6 +7334,12 @@
 				<qualityScore value="-1"/>
 			</xmi:Extension>
 		</ownedMember>
+		<ownedMember name="prov:type" xmi:id="Class_prov:type_id" xmi:type="uml:Stereotype">
+			<xmi:Extension extender="Visual Paradigm for UML">
+				<baseType value="Class"/>
+				<qualityScore value="-1"/>
+			</xmi:Extension>
+		</ownedMember>
 		<ownedMember isAbstract="false" isDerived="false" isLeaf="false" name="starter" xmi:id="v9.uWuyEwTiAAgXF" xmi:type="uml:Association">
 			<memberEnd xmi:idref="v9.uWuyEwTiAAgXG"/>
 			<ownedEnd aggregation="none" association="v9.uWuyEwTiAAgXF" isDerived="false" type="_i1UWuyEwTiAAgSK" xmi:id="v9.uWuyEwTiAAgXG" xmi:type="uml:Property">
@@ -7447,36 +7668,6 @@
 				<qualityReason value="2&#9;2"/>
 			</xmi:Extension>
 		</ownedMember>
-		<ownedMember isAbstract="false" isDerived="false" isLeaf="false" xmi:id="vVSGjuyCiu1SNwm4" xmi:type="uml:Association">
-			<memberEnd xmi:idref="vVSGjuyCiu1SNwm5"/>
-			<ownedEnd aggregation="none" association="vVSGjuyCiu1SNwm4" isDerived="false" name="time" type="tkL1WuyEwTiAAgcE" xmi:id="vVSGjuyCiu1SNwm5" xmi:type="uml:Property">
-				<xmi:Extension extender="Visual Paradigm for UML">
-					<associationEnd/>
-					<qualifier name="" xmi:id="vVSGjuyCiu1SNwm6" xmi:type="qualifier">
-						<xmi:Extension extender="Visual Paradigm for UML">
-							<qualityScore value="-1"/>
-						</xmi:Extension>
-					</qualifier>
-					<qualityScore value="92"/>
-					<qualityReason value="1&#9;1&#10;2&#9;2"/>
-				</xmi:Extension>
-			</ownedEnd>
-			<memberEnd xmi:idref="vVSGjuyCiu1SNwm7"/>
-			<ownedEnd aggregation="none" association="vVSGjuyCiu1SNwm4" isDerived="false" isNavigable="true" type="n0UGjuyCiu1SNwmv" xmi:id="vVSGjuyCiu1SNwm7" xmi:type="uml:Property">
-				<xmi:Extension extender="Visual Paradigm for UML">
-					<associationEnd/>
-					<qualifier name="" xmi:id="vVSGjuyCiu1SNwm8" xmi:type="qualifier">
-						<xmi:Extension extender="Visual Paradigm for UML">
-							<qualityScore value="-1"/>
-						</xmi:Extension>
-					</qualifier>
-					<qualityScore value="-1"/>
-				</xmi:Extension>
-			</ownedEnd>
-			<xmi:Extension extender="Visual Paradigm for UML">
-				<qualityScore value="100"/>
-			</xmi:Extension>
-		</ownedMember>
 		<ownedMember isAbstract="false" isDerived="false" isLeaf="false" name="time" xmi:id="fOWGjuyCiu1SNwnM" xmi:type="uml:Association">
 			<memberEnd xmi:idref="fOWGjuyCiu1SNwnN"/>
 			<ownedEnd aggregation="none" association="fOWGjuyCiu1SNwnM" isDerived="false" type="9un1WuyEwTiAAgcK" xmi:id="fOWGjuyCiu1SNwnN" xmi:type="uml:Property">
@@ -7933,13 +8124,102 @@
 				<qualityScore value="100"/>
 			</xmi:Extension>
 		</ownedMember>
+		<ownedMember isAbstract="false" isDerived="false" isLeaf="false" xmi:id="ghXBHuyCiu1SNxMM" xmi:type="uml:Association">
+			<memberEnd xmi:idref="ghXBHuyCiu1SNxMN"/>
+			<ownedEnd aggregation="none" association="ghXBHuyCiu1SNxMM" isDerived="false" isNavigable="true" type="Oa6BHuyCiu1SNxLh" xmi:id="ghXBHuyCiu1SNxMN" xmi:type="uml:Property">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<associationEnd/>
+					<qualifier name="" xmi:id="ghXBHuyCiu1SNxMO" xmi:type="qualifier">
+						<xmi:Extension extender="Visual Paradigm for UML">
+							<qualityScore value="-1"/>
+						</xmi:Extension>
+					</qualifier>
+					<qualityScore value="-1"/>
+				</xmi:Extension>
+			</ownedEnd>
+			<memberEnd xmi:idref="QhXBHuyCiu1SNxMP"/>
+			<ownedEnd aggregation="none" association="ghXBHuyCiu1SNxMM" isDerived="false" isNavigable="true" type="Xw_ibuyCiu1SNxFK" xmi:id="QhXBHuyCiu1SNxMP" xmi:type="uml:Property">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<associationEnd/>
+					<qualifier name="" xmi:id="QhXBHuyCiu1SNxMQ" xmi:type="qualifier">
+						<xmi:Extension extender="Visual Paradigm for UML">
+							<qualityScore value="-1"/>
+						</xmi:Extension>
+					</qualifier>
+					<qualityScore value="-1"/>
+				</xmi:Extension>
+			</ownedEnd>
+			<xmi:Extension extender="Visual Paradigm for UML">
+				<qualityScore value="100"/>
+			</xmi:Extension>
+		</ownedMember>
+		<ownedMember isAbstract="false" isDerived="false" isLeaf="false" name="time" xmi:id="eWBu3uyCiu1SNxXO" xmi:type="uml:Association">
+			<memberEnd xmi:idref="eWBu3uyCiu1SNxXP"/>
+			<ownedEnd aggregation="none" association="eWBu3uyCiu1SNxXO" isDerived="false" type="tkL1WuyEwTiAAgcE" xmi:id="eWBu3uyCiu1SNxXP" xmi:type="uml:Property">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<associationEnd/>
+					<qualifier name="" xmi:id="eWBu3uyCiu1SNxXQ" xmi:type="qualifier">
+						<xmi:Extension extender="Visual Paradigm for UML">
+							<qualityScore value="-1"/>
+						</xmi:Extension>
+					</qualifier>
+					<qualityScore value="-1"/>
+				</xmi:Extension>
+			</ownedEnd>
+			<memberEnd xmi:idref="eWBu3uyCiu1SNxXR"/>
+			<ownedEnd aggregation="none" association="eWBu3uyCiu1SNxXO" isDerived="false" isNavigable="true" type="n0UGjuyCiu1SNwmv" xmi:id="eWBu3uyCiu1SNxXR" xmi:type="uml:Property">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<associationEnd/>
+					<qualifier name="" xmi:id="eWBu3uyCiu1SNxXS" xmi:type="qualifier">
+						<xmi:Extension extender="Visual Paradigm for UML">
+							<qualityScore value="-1"/>
+						</xmi:Extension>
+					</qualifier>
+					<qualityScore value="-1"/>
+				</xmi:Extension>
+			</ownedEnd>
+			<xmi:Extension extender="Visual Paradigm for UML">
+				<qualityScore value="97"/>
+				<qualityReason value="2&#9;2"/>
+			</xmi:Extension>
+		</ownedMember>
+		<ownedMember isAbstract="false" isDerived="false" isLeaf="false" name="wasInformedBy" xmi:id="1MC5_uyCiu1SNxbJ" xmi:type="uml:Association">
+			<memberEnd xmi:idref="1MC5_uyCiu1SNxbK"/>
+			<ownedEnd aggregation="none" association="1MC5_uyCiu1SNxbJ" isDerived="false" isNavigable="true" type="vTljmuyEwTiAAgLp" xmi:id="1MC5_uyCiu1SNxbK" xmi:type="uml:Property">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<associationEnd/>
+					<qualifier name="" xmi:id="1MC5_uyCiu1SNxbL" xmi:type="qualifier">
+						<xmi:Extension extender="Visual Paradigm for UML">
+							<qualityScore value="-1"/>
+						</xmi:Extension>
+					</qualifier>
+					<qualityScore value="-1"/>
+				</xmi:Extension>
+			</ownedEnd>
+			<memberEnd xmi:idref="1MC5_uyCiu1SNxbM"/>
+			<ownedEnd aggregation="none" association="1MC5_uyCiu1SNxbJ" isDerived="false" type="vTljmuyEwTiAAgLp" xmi:id="1MC5_uyCiu1SNxbM" xmi:type="uml:Property">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<associationEnd/>
+					<qualifier name="" xmi:id="1MC5_uyCiu1SNxbN" xmi:type="qualifier">
+						<xmi:Extension extender="Visual Paradigm for UML">
+							<qualityScore value="-1"/>
+						</xmi:Extension>
+					</qualifier>
+					<qualityScore value="-1"/>
+				</xmi:Extension>
+			</ownedEnd>
+			<xmi:Extension extender="Visual Paradigm for UML">
+				<qualityScore value="97"/>
+				<qualityReason value="2&#9;2"/>
+			</xmi:Extension>
+		</ownedMember>
 	</uml:Model>
 	<uml:Diagram diagramType="ClassDiagram" documentation="" name="Component1" toolName="Visual Paradigm for UML" xmi:id="EUejmuyEwTiAAgLc">
 		<xmi:Extension extender="Visual Paradigm for UML">
 			<properties>
 				<apmAuthor value="lavm"/>
 				<apmCreateDateTime value="1337240969847"/>
-				<apmLastModified value="1337756042092"/>
+				<apmLastModified value="1337877259020"/>
 				<ashowPackageNameStyle value="0"/>
 				<ashowConnectorName value="0"/>
 				<apaintConnectorThroughLabel value="0"/>
@@ -7967,7 +8247,7 @@
 				<ax value="0"/>
 				<ay value="0"/>
 				<awidth value="1235"/>
-				<aheight value="505"/>
+				<aheight value="507"/>
 				<aqualityScore value="-1"/>
 				<aparentModel value="g7h.WuyEwTiAAgZK"/>
 				<a_globalPaletteOption value="true"/>
@@ -8003,7 +8283,7 @@
 					<properties>
 						<abackground value="Cr:192,192,192,255"/>
 						<aforeground value="Cr:0,0,0,255"/>
-						<azOrder value="26"/>
+						<azOrder value="24"/>
 						<aselectable value="true"/>
 						<arequestResetCaption value="false"/>
 						<arequestResetCaptionSize value="false"/>
@@ -8067,7 +8347,7 @@
 					<properties>
 						<abackground value="Cr:192,192,192,255"/>
 						<aforeground value="Cr:0,0,0,255"/>
-						<azOrder value="22"/>
+						<azOrder value="20"/>
 						<acreatorDiagramType value="ClassDiagram"/>
 						<aselectable value="true"/>
 						<arequestResetCaption value="false"/>
@@ -8132,7 +8412,7 @@
 					<properties>
 						<abackground value="Cr:192,192,192,255"/>
 						<aforeground value="Cr:0,0,0,255"/>
-						<azOrder value="20"/>
+						<azOrder value="18"/>
 						<acreatorDiagramType value="ClassDiagram"/>
 						<aselectable value="true"/>
 						<arequestResetCaption value="false"/>
@@ -8197,7 +8477,7 @@
 					<properties>
 						<abackground value="Cr:192,192,192,255"/>
 						<aforeground value="Cr:0,0,0,255"/>
-						<azOrder value="18"/>
+						<azOrder value="16"/>
 						<acreatorDiagramType value="ClassDiagram"/>
 						<aselectable value="true"/>
 						<arequestResetCaption value="false"/>
@@ -8262,7 +8542,7 @@
 					<properties>
 						<abackground value="Cr:192,192,192,255"/>
 						<aforeground value="Cr:0,0,0,255"/>
-						<azOrder value="16"/>
+						<azOrder value="14"/>
 						<acreatorDiagramType value="ClassDiagram"/>
 						<aselectable value="true"/>
 						<arequestResetCaption value="false"/>
@@ -8327,7 +8607,7 @@
 					<properties>
 						<abackground value="Cr:192,192,192,255"/>
 						<aforeground value="Cr:0,0,0,255"/>
-						<azOrder value="14"/>
+						<azOrder value="12"/>
 						<acreatorDiagramType value="ClassDiagram"/>
 						<aselectable value="true"/>
 						<arequestResetCaption value="false"/>
@@ -8392,7 +8672,7 @@
 					<properties>
 						<abackground value="Cr:122,207,245,255"/>
 						<aforeground value="Cr:0,0,0,255"/>
-						<azOrder value="12"/>
+						<azOrder value="10"/>
 						<aselectable value="true"/>
 						<arequestResetCaption value="false"/>
 						<arequestResetCaptionSize value="false"/>
@@ -8433,7 +8713,7 @@
 					<properties>
 						<abackground value="Cr:192,255,192,255"/>
 						<aforeground value="Cr:0,0,0,255"/>
-						<azOrder value="6"/>
+						<azOrder value="4"/>
 						<aselectable value="true"/>
 						<arequestResetCaption value="false"/>
 						<arequestResetCaptionSize value="false"/>
@@ -8487,75 +8767,9 @@
 				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
 				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
 			</uml:DiagramElement>
-			<uml:DiagramElement geometry="240,390;320,440;320,440;" preferredShapeType="Association" subject="vVSGjuyCiu1SNwm4" xmi:id="fVSGjuyCiu1SNwm9">
-				<xmi:Extension extender="Visual Paradigm for UML">
-					<captionBounds value="277,408,20,0"/>
-					<captionInternalWidth value="-2147483648"/>
-					<captionInternalHeight value="-2147483648"/>
-					<captionVisible value="true"/>
-					<captionSide value="1"/>
-					<roleA roleName="219,398,44,14"/>
-					<properties>
-						<abackground value="Cr:122,207,245,255"/>
-						<aforeground value="Cr:0,0,0,255"/>
-						<azOrder value="-1"/>
-						<acreatorDiagramType value="ClassDiagram"/>
-						<aselectable value="true"/>
-						<arequestResetCaption value="false"/>
-						<arequestResetCaptionSize value="false"/>
-						<aconnectorStyle value="3"/>
-						<aconnectorLineJumps value="4"/>
-						<aconnectorLabelOrientation value="4"/>
-						<afromShapeXDiff value="0"/>
-						<afromShapeYDiff value="0"/>
-						<atoShapeXDiff value="0"/>
-						<atoShapeYDiff value="0"/>
-						<afromConnectType value="0"/>
-						<atoConnectType value="0"/>
-						<auseFromShapeCenter value="true"/>
-						<auseToShapeCenter value="true"/>
-						<afromPinType value="1"/>
-						<atoPinType value="1"/>
-						<arequestRebuild value="false"/>
-						<ashowConnectorName value="2"/>
-						<apaintThroughLabel value="2"/>
-						<ahasRoleAShape value="true"/>
-						<ahasRoleBShape value="false"/>
-						<ashowMultiplicityConstraints value="false"/>
-						<aroleARectangle value="Re:219.0,398.0,44.0,14.0"/>
-						<ahasMultiplicityAShape value="false"/>
-						<ahasMultiplicityBShape value="false"/>
-						<a0SwDr value="false"/>
-						<ashowStereotypes value="true"/>
-						<ashowFromRoleName value="true"/>
-						<ashowToRoleName value="true"/>
-						<ashowFromMultiplicity value="true"/>
-						<ashowToMultiplicity value="true"/>
-						<ashowFromRoleVisibility value="true"/>
-						<ashowToRoleVisibility value="true"/>
-						<ashowAssociationEndPropertyStrings value="false"/>
-						<ahasAssociationEndPropertyStringsAShape value="false"/>
-						<ahasAssociationEndPropertyStringsBShape value="false"/>
-						<afromRoleInternalWidth value="-2147483648"/>
-						<afromRoleInternalHeight value="-2147483648"/>
-						<atoRoleInternalWidth value="-2147483648"/>
-						<atoRoleInternalHeight value="-2147483648"/>
-						<afromMultiplicityInternalWidth value="-2147483648"/>
-						<afromMultiplicityInternalHeight value="-2147483648"/>
-						<atoMultiplicityInternalWidth value="-2147483648"/>
-						<atoMultiplicityInternalHeight value="-2147483648"/>
-						<aassociationEndPropertyStringsAInternalWidth value="-2147483648"/>
-						<aassociationEndPropertyStringsAInternalHeight value="-2147483648"/>
-						<aassociationEndPropertyStringsBInternalWidth value="-2147483648"/>
-						<aassociationEndPropertyStringsBInternalHeight value="-2147483648"/>
-					</properties>
-				</xmi:Extension>
-				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
-				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
-			</uml:DiagramElement>
-			<uml:DiagramElement geometry="360,394;360,439;" preferredShapeType="Association" subject="fOWGjuyCiu1SNwnM" xmi:id="_OWGjuyCiu1SNwnR">
-				<xmi:Extension extender="Visual Paradigm for UML">
-					<captionBounds value="355,400,44,14"/>
+			<uml:DiagramElement geometry="360,390;360,439;" preferredShapeType="Association" subject="fOWGjuyCiu1SNwnM" xmi:id="_OWGjuyCiu1SNwnR">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<captionBounds value="355,398,44,14"/>
 					<captionInternalWidth value="-2147483648"/>
 					<captionInternalHeight value="-2147483648"/>
 					<captionVisible value="true"/>
@@ -8682,9 +8896,9 @@
 				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
 				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
 			</uml:DiagramElement>
-			<uml:DiagramElement geometry="470,394;420,440;" preferredShapeType="Association" subject="yvTGjuyCiu1SNwn8" xmi:id="KvTGjuyCiu1SNwoB">
-				<xmi:Extension extender="Visual Paradigm for UML">
-					<captionBounds value="405,410,44,14"/>
+			<uml:DiagramElement geometry="487,390;420,440;" preferredShapeType="Association" subject="yvTGjuyCiu1SNwn8" xmi:id="KvTGjuyCiu1SNwoB">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<captionBounds value="413,408,44,14"/>
 					<captionInternalWidth value="-2147483648"/>
 					<captionInternalHeight value="-2147483648"/>
 					<captionVisible value="true"/>
@@ -9132,9 +9346,9 @@
 				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
 				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
 			</uml:DiagramElement>
-			<uml:DiagramElement geometry="651,78;651,39;750,39;750,140;671,140;" preferredShapeType="Association" subject="g1DjeuyCiu1SNwVB" xmi:id="E1DjeuyCiu1SNwVN">
-				<xmi:Extension extender="Visual Paradigm for UML">
-					<captionBounds value="735,150,101,14"/>
+			<uml:DiagramElement geometry="651,78;651,59;722,59;722,140;671,140;" preferredShapeType="Association" subject="g1DjeuyCiu1SNwVB" xmi:id="E1DjeuyCiu1SNwVN">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<captionBounds value="689,147,101,14"/>
 					<captionInternalWidth value="-2147483648"/>
 					<captionInternalHeight value="-2147483648"/>
 					<captionVisible value="true"/>
@@ -9196,9 +9410,9 @@
 				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
 				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
 			</uml:DiagramElement>
-			<uml:DiagramElement geometry="720,140;720,329;" preferredShapeType="AssociationClass" subject="fUCTeuyCiu1SNwWy" xmi:id="fUCTeuyCiu1SNwWz">
-				<xmi:Extension extender="Visual Paradigm for UML">
-					<captionBounds value="727,294,20,0"/>
+			<uml:DiagramElement geometry="693,140;693,329;" preferredShapeType="AssociationClass" subject="fUCTeuyCiu1SNwWy" xmi:id="fUCTeuyCiu1SNwWz">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<captionBounds value="700,294,20,0"/>
 					<captionInternalWidth value="-2147483648"/>
 					<captionInternalHeight value="-2147483648"/>
 					<captionVisible value="true"/>
@@ -9241,7 +9455,7 @@
 					<properties>
 						<abackground value="Cr:122,207,245,255"/>
 						<aforeground value="Cr:0,0,0,255"/>
-						<azOrder value="23"/>
+						<azOrder value="21"/>
 						<acreatorDiagramType value="ClassDiagram"/>
 						<aselectable value="true"/>
 						<arequestResetCaption value="false"/>
@@ -9664,7 +9878,7 @@
 			</uml:DiagramElement>
 			<uml:DiagramElement geometry="290,280;290,539;" preferredShapeType="AssociationClass" subject="9G50WuyEwTiAAgTM" xmi:id="9G50WuyEwTiAAgTN">
 				<xmi:Extension extender="Visual Paradigm for UML">
-					<captionBounds value="251,298,20,0"/>
+					<captionBounds value="206,506,20,0"/>
 					<captionInternalWidth value="-2147483648"/>
 					<captionInternalHeight value="-2147483648"/>
 					<captionVisible value="true"/>
@@ -9798,7 +10012,7 @@
 				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
 				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
 			</uml:DiagramElement>
-			<uml:DiagramElement geometry="112,51,609,161" preferredShapeType="SECurveShape" subject="24s2HuyCiu1SNxHD" xmi:id="24s2HuyCiu1SNxHC">
+			<uml:DiagramElement geometry="113,36,684,178" preferredShapeType="SECurveShape" subject="24s2HuyCiu1SNxHD" xmi:id="24s2HuyCiu1SNxHC">
 				<xmi:Extension extender="Visual Paradigm for UML">
 					<captionBounds value="0,0,40,40"/>
 					<captionInternalWidth value="-2147483648"/>
@@ -9808,7 +10022,7 @@
 					<properties>
 						<abackground value="Cr:255,255,192,127"/>
 						<aforeground value="Cr:192,192,192,255"/>
-						<azOrder value="28"/>
+						<azOrder value="26"/>
 						<aselectable value="true"/>
 						<arequestResetCaption value="false"/>
 						<arequestResetCaptionSize value="false"/>
@@ -9824,7 +10038,7 @@
 						<arequestDefaultSize value="false"/>
 						<arequestFitSize value="false"/>
 						<arequestFitSizeFromCenter value="false"/>
-						<aobjectId value="28"/>
+						<aobjectId value="26"/>
 						<aobjectType value="9096"/>
 						<anotUseVisibleBounds value="false"/>
 						<aalpha value="1.0"/>
@@ -9836,42 +10050,42 @@
 					<FontFormat fontColor="Cr:0,0,0,255">
 						<Font name="Dialog" size="11" style="0"/>
 					</FontFormat>
-					<Label location="Pt:416.5,131.5" text=""/>
+					<Label location="Pt:455.00000000000006,125.0" text=""/>
 					<Label transparency="0" tx="0.0" ty="0.0" type="0">
 						<FillFormat renderStyle="1">
 							<AffineTransformMatrix>
-								<Matrix value="1.003454231433506"/>
+								<Matrix value="1.1329879101899827"/>
 								<Matrix value="0.0"/>
 								<Matrix value="0.0"/>
-								<Matrix value="0.8012048192771086"/>
-								<Matrix value="30.67184801381704"/>
-								<Matrix value="28.94578313253015"/>
+								<Matrix value="0.9036144578313259"/>
+								<Matrix value="19.366148531951737"/>
+								<Matrix value="9.337349397590348"/>
 							</AffineTransformMatrix>
 							<Render color="Cr:0,0,0,255"/>
 						</FillFormat>
 					</Label>
-					<ShapeBasePoint point="Pt:416.5,131.5"/>
+					<ShapeBasePoint point="Pt:455.0000000000001,124.99999999999999"/>
 					<Arrow endArrow="0" startArrow="0"/>
 					<LineFormat color="Cr:192,192,192,255" style="91" width="1.0">
 						<Stroke cap="0" dashPhase="0.0" join="0" miterlimit="10.0" type="0" width="1.0"/>
 					</LineFormat>
 					<FillFormat renderStyle="1">
 						<AffineTransformMatrix>
-							<Matrix value="1.003454231433506"/>
+							<Matrix value="1.1329879101899827"/>
 							<Matrix value="0.0"/>
 							<Matrix value="0.0"/>
-							<Matrix value="0.8012048192771086"/>
-							<Matrix value="30.67184801381704"/>
-							<Matrix value="28.94578313253015"/>
+							<Matrix value="0.9036144578313259"/>
+							<Matrix value="19.366148531951737"/>
+							<Matrix value="9.337349397590348"/>
 						</AffineTransformMatrix>
 						<Render color="Cr:255,255,192,127"/>
 					</FillFormat>
 					<CurveList windingRule="1">
 						<Curves>
-							<Curve controlPoint1="Pt:271.25,65.0" controlPoint2="Pt:561.75,65.0" endPoint="Pt:707.0,65.0" objectId="1" startPoint="Pt:126.0,65.0"/>
-							<Curve controlPoint1="Pt:707.0,98.25" controlPoint2="Pt:707.0,164.75" endPoint="Pt:707.0,198.0" objectId="2" startPoint="Pt:707.0,65.0"/>
-							<Curve controlPoint1="Pt:561.75,198.0" controlPoint2="Pt:271.25,198.0" endPoint="Pt:126.0,198.0" objectId="3" startPoint="Pt:707.0,198.0"/>
-							<Curve controlPoint1="Pt:126.0,164.75" controlPoint2="Pt:126.0,98.25" endPoint="Pt:126.0,65.0" objectId="4" startPoint="Pt:126.0,198.0"/>
+							<Curve controlPoint1="Pt:291.0,49.99999999999997" controlPoint2="Pt:619.0,49.99999999999997" endPoint="Pt:783.0000000000002,49.99999999999997" objectId="1" startPoint="Pt:127.0,49.99999999999997"/>
+							<Curve controlPoint1="Pt:783.0000000000002,87.49999999999999" controlPoint2="Pt:783.0000000000002,162.5" endPoint="Pt:783.0000000000002,200.0" objectId="2" startPoint="Pt:783.0000000000002,49.99999999999997"/>
+							<Curve controlPoint1="Pt:619.0,200.0" controlPoint2="Pt:291.0,200.0" endPoint="Pt:127.0,200.0" objectId="3" startPoint="Pt:783.0000000000002,200.0"/>
+							<Curve controlPoint1="Pt:127.0,162.5" controlPoint2="Pt:127.0,87.49999999999999" endPoint="Pt:127.0,49.99999999999997" objectId="4" startPoint="Pt:127.0,200.0"/>
 						</Curves>
 					</CurveList>
 				</xmi:Extension>
@@ -9913,37 +10127,102 @@
 				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
 				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
 			</uml:DiagramElement>
-			<uml:DiagramElement geometry="148,259;148,212;" preferredShapeType="Anchor" subject="EOr2HuyCiu1SNxHr" xmi:id="Yur2HuyCiu1SNxHs">
-				<xmi:Extension extender="Visual Paradigm for UML">
-					<captionBounds value="158,271,20,0"/>
-					<captionInternalWidth value="-2147483648"/>
-					<captionInternalHeight value="-2147483648"/>
-					<captionVisible value="true"/>
-					<captionSide value="1"/>
-					<properties>
-						<abackground value="Cr:122,207,245,255"/>
-						<aforeground value="Cr:0,0,0,255"/>
-						<azOrder value="-1"/>
-						<acreatorDiagramType value="ClassDiagram"/>
-						<aselectable value="true"/>
-						<arequestResetCaption value="false"/>
-						<arequestResetCaptionSize value="false"/>
-						<aconnectorStyle value="3"/>
-						<aconnectorLineJumps value="4"/>
-						<aconnectorLabelOrientation value="4"/>
-						<afromShapeXDiff value="0"/>
-						<afromShapeYDiff value="0"/>
-						<atoShapeXDiff value="0"/>
-						<atoShapeYDiff value="0"/>
-						<afromConnectType value="0"/>
-						<atoConnectType value="0"/>
-						<auseFromShapeCenter value="true"/>
-						<auseToShapeCenter value="true"/>
-						<afromPinType value="1"/>
-						<atoPinType value="1"/>
-						<arequestRebuild value="false"/>
-						<ashowConnectorName value="2"/>
-						<apaintThroughLabel value="2"/>
+			<uml:DiagramElement geometry="148,259;148,200;" preferredShapeType="Anchor" subject="EOr2HuyCiu1SNxHr" xmi:id="Yur2HuyCiu1SNxHs">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<captionBounds value="158,265,20,0"/>
+					<captionInternalWidth value="-2147483648"/>
+					<captionInternalHeight value="-2147483648"/>
+					<captionVisible value="true"/>
+					<captionSide value="1"/>
+					<properties>
+						<abackground value="Cr:122,207,245,255"/>
+						<aforeground value="Cr:0,0,0,255"/>
+						<azOrder value="-1"/>
+						<acreatorDiagramType value="ClassDiagram"/>
+						<aselectable value="true"/>
+						<arequestResetCaption value="false"/>
+						<arequestResetCaptionSize value="false"/>
+						<aconnectorStyle value="3"/>
+						<aconnectorLineJumps value="4"/>
+						<aconnectorLabelOrientation value="4"/>
+						<afromShapeXDiff value="0"/>
+						<afromShapeYDiff value="0"/>
+						<atoShapeXDiff value="0"/>
+						<atoShapeYDiff value="0"/>
+						<afromConnectType value="0"/>
+						<atoConnectType value="0"/>
+						<auseFromShapeCenter value="true"/>
+						<auseToShapeCenter value="true"/>
+						<afromPinType value="1"/>
+						<atoPinType value="1"/>
+						<arequestRebuild value="false"/>
+						<ashowConnectorName value="2"/>
+						<apaintThroughLabel value="2"/>
+					</properties>
+				</xmi:Extension>
+				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
+				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
+			</uml:DiagramElement>
+			<uml:DiagramElement geometry="235,390;320,457;" preferredShapeType="Association" subject="eWBu3uyCiu1SNxXO" xmi:id=".WBu3uyCiu1SNxXT">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<captionBounds value="197,401,44,14"/>
+					<captionInternalWidth value="-2147483648"/>
+					<captionInternalHeight value="-2147483648"/>
+					<captionVisible value="true"/>
+					<captionSide value="1"/>
+					<properties>
+						<abackground value="Cr:122,207,245,255"/>
+						<aforeground value="Cr:0,0,0,255"/>
+						<azOrder value="-1"/>
+						<acreatorDiagramType value="ClassDiagram"/>
+						<aselectable value="true"/>
+						<arequestResetCaption value="false"/>
+						<arequestResetCaptionSize value="false"/>
+						<aconnectorStyle value="3"/>
+						<aconnectorLineJumps value="4"/>
+						<aconnectorLabelOrientation value="4"/>
+						<afromShapeXDiff value="0"/>
+						<afromShapeYDiff value="0"/>
+						<atoShapeXDiff value="0"/>
+						<atoShapeYDiff value="0"/>
+						<afromConnectType value="0"/>
+						<atoConnectType value="0"/>
+						<auseFromShapeCenter value="true"/>
+						<auseToShapeCenter value="true"/>
+						<afromPinType value="1"/>
+						<atoPinType value="2"/>
+						<atoPinRatio value="Pt:0.0,0.42500001192092896"/>
+						<arequestRebuild value="false"/>
+						<ashowConnectorName value="2"/>
+						<apaintThroughLabel value="2"/>
+						<ahasRoleAShape value="false"/>
+						<ahasRoleBShape value="false"/>
+						<ashowMultiplicityConstraints value="false"/>
+						<ahasMultiplicityAShape value="false"/>
+						<ahasMultiplicityBShape value="false"/>
+						<a0SwDr value="false"/>
+						<ashowStereotypes value="true"/>
+						<ashowFromRoleName value="true"/>
+						<ashowToRoleName value="true"/>
+						<ashowFromMultiplicity value="true"/>
+						<ashowToMultiplicity value="true"/>
+						<ashowFromRoleVisibility value="true"/>
+						<ashowToRoleVisibility value="true"/>
+						<ashowAssociationEndPropertyStrings value="false"/>
+						<ahasAssociationEndPropertyStringsAShape value="false"/>
+						<ahasAssociationEndPropertyStringsBShape value="false"/>
+						<afromRoleInternalWidth value="-2147483648"/>
+						<afromRoleInternalHeight value="-2147483648"/>
+						<atoRoleInternalWidth value="-2147483648"/>
+						<atoRoleInternalHeight value="-2147483648"/>
+						<afromMultiplicityInternalWidth value="-2147483648"/>
+						<afromMultiplicityInternalHeight value="-2147483648"/>
+						<atoMultiplicityInternalWidth value="-2147483648"/>
+						<atoMultiplicityInternalHeight value="-2147483648"/>
+						<aassociationEndPropertyStringsAInternalWidth value="-2147483648"/>
+						<aassociationEndPropertyStringsAInternalHeight value="-2147483648"/>
+						<aassociationEndPropertyStringsBInternalWidth value="-2147483648"/>
+						<aassociationEndPropertyStringsBInternalHeight value="-2147483648"/>
 					</properties>
 				</xmi:Extension>
 				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
@@ -9956,7 +10235,7 @@
 			<properties>
 				<apmAuthor value="lavm"/>
 				<apmCreateDateTime value="1337258412202"/>
-				<apmLastModified value="1337756012184"/>
+				<apmLastModified value="1337877015595"/>
 				<ashowPackageNameStyle value="0"/>
 				<ashowConnectorName value="0"/>
 				<apaintConnectorThroughLabel value="0"/>
@@ -9984,7 +10263,7 @@
 				<ax value="0"/>
 				<ay value="0"/>
 				<awidth value="1235"/>
-				<aheight value="505"/>
+				<aheight value="507"/>
 				<aqualityScore value="-1"/>
 				<aparentModel value="WzQLWuyEwTiAAgey"/>
 				<a_globalPaletteOption value="true"/>
@@ -10010,7 +10289,71 @@
 			</properties>
 		</xmi:Extension>
 		<uml:Diagram.element>
-			<uml:DiagramElement geometry="700,110,80,80" preferredShapeType="Class" subject="vTljmuyEwTiAAgLp" xmi:id="7rBLWuyEwTiAAgfZ">
+			<uml:DiagramElement geometry="700,110,80,78" preferredShapeType="Class" subject="vTljmuyEwTiAAgLp" xmi:id="7rBLWuyEwTiAAgfZ">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<captionBounds value="0,0,80,14"/>
+					<captionInternalWidth value="-2147483648"/>
+					<captionInternalHeight value="-2147483648"/>
+					<captionVisible value="true"/>
+					<captionSide value="12"/>
+					<properties>
+						<abackground value="Cr:122,207,245,255"/>
+						<aforeground value="Cr:0,0,0,255"/>
+						<azOrder value="21"/>
+						<aselectable value="true"/>
+						<arequestResetCaption value="false"/>
+						<arequestResetCaptionSize value="false"/>
+						<adisplayStereotypeIcon value="false"/>
+						<aoverrideAppearanceWithStereotypeIcon value="true"/>
+						<arequestSetSizeOption value="0"/>
+						<aparentConnectorHeaderLength value="40"/>
+						<aparentConnectorLineLength value="10"/>
+						<aconnectToPoint value="true"/>
+						<aparentConnectorDTheta value="0.0"/>
+						<aconnectionPointType value="2"/>
+						<amodelElementNameAlignment value="9"/>
+						<arequestDefaultSize value="false"/>
+						<arequestFitSize value="false"/>
+						<arequestFitSizeFromCenter value="false"/>
+						<adisplayAsRobustnessAnalysisIcon value="true"/>
+						<avisibilityStyle value="1"/>
+						<ashowAttributeType value="1"/>
+						<ashowOperationType value="1"/>
+						<amSwTpPts value="true"/>
+						<alshRfAts value="true"/>
+						<amShDrAt value="false"/>
+						<akShDrOp value="false"/>
+						<akSwCsMbSt value="true"/>
+						<ashowClassMemberConstraints value="true"/>
+						<alShCmMl value="false"/>
+						<ashowOperationParameterDirection value="false"/>
+						<ashowOperationRaisedExceptions value="false"/>
+						<ashowParameterNameInOperationSignature value="true"/>
+						<ashowOperationTemplateParameters value="false"/>
+						<ashowOperationProperties value="false"/>
+						<awpMbs value="false"/>
+						<aattributeSortType value="0"/>
+						<aoperationSortType value="0"/>
+						<ashowInitialAttributeValue value="true"/>
+						<ashowOperationSignature value="true"/>
+						<ainterfaceBall value="false"/>
+						<ashowEmptyCompartments value="0"/>
+						<ashowEllipsisForUnshownMembers value="0"/>
+						<ashowAttributesCodeDetails value="0"/>
+						<ashowOperationsCodeDetails value="0"/>
+						<ashowParametersCodeDetails value="0"/>
+						<ashowTypeOption value="0"/>
+						<ashowOwnerOption value="3"/>
+						<ashowAttributesType value="0"/>
+						<ashowOperationsParameters value="0"/>
+						<ashowOperationsReturnType value="0"/>
+					</properties>
+				</xmi:Extension>
+				<elementFill color1="Cr:122,207,245,255" color2="" style="1" transparency="0" type="1"/>
+				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
+				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
+			</uml:DiagramElement>
+			<uml:DiagramElement geometry="360,132,80,59" preferredShapeType="Class" subject="m6xjmuyEwTiAAgLk" xmi:id="B3VLWuyEwTiAAgfm">
 				<xmi:Extension extender="Visual Paradigm for UML">
 					<captionBounds value="0,0,80,14"/>
 					<captionInternalWidth value="-2147483648"/>
@@ -10074,73 +10417,9 @@
 				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
 				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
 			</uml:DiagramElement>
-			<uml:DiagramElement geometry="360,140,80,50" preferredShapeType="Class" subject="m6xjmuyEwTiAAgLk" xmi:id="B3VLWuyEwTiAAgfm">
-				<xmi:Extension extender="Visual Paradigm for UML">
-					<captionBounds value="0,0,80,14"/>
-					<captionInternalWidth value="-2147483648"/>
-					<captionInternalHeight value="-2147483648"/>
-					<captionVisible value="true"/>
-					<captionSide value="12"/>
-					<properties>
-						<abackground value="Cr:122,207,245,255"/>
-						<aforeground value="Cr:0,0,0,255"/>
-						<azOrder value="17"/>
-						<aselectable value="true"/>
-						<arequestResetCaption value="false"/>
-						<arequestResetCaptionSize value="false"/>
-						<adisplayStereotypeIcon value="false"/>
-						<aoverrideAppearanceWithStereotypeIcon value="true"/>
-						<arequestSetSizeOption value="0"/>
-						<aparentConnectorHeaderLength value="40"/>
-						<aparentConnectorLineLength value="10"/>
-						<aconnectToPoint value="true"/>
-						<aparentConnectorDTheta value="0.0"/>
-						<aconnectionPointType value="2"/>
-						<amodelElementNameAlignment value="9"/>
-						<arequestDefaultSize value="false"/>
-						<arequestFitSize value="false"/>
-						<arequestFitSizeFromCenter value="false"/>
-						<adisplayAsRobustnessAnalysisIcon value="true"/>
-						<avisibilityStyle value="1"/>
-						<ashowAttributeType value="1"/>
-						<ashowOperationType value="1"/>
-						<amSwTpPts value="true"/>
-						<alshRfAts value="true"/>
-						<amShDrAt value="false"/>
-						<akShDrOp value="false"/>
-						<akSwCsMbSt value="true"/>
-						<ashowClassMemberConstraints value="true"/>
-						<alShCmMl value="false"/>
-						<ashowOperationParameterDirection value="false"/>
-						<ashowOperationRaisedExceptions value="false"/>
-						<ashowParameterNameInOperationSignature value="true"/>
-						<ashowOperationTemplateParameters value="false"/>
-						<ashowOperationProperties value="false"/>
-						<awpMbs value="false"/>
-						<aattributeSortType value="0"/>
-						<aoperationSortType value="0"/>
-						<ashowInitialAttributeValue value="true"/>
-						<ashowOperationSignature value="true"/>
-						<ainterfaceBall value="false"/>
-						<ashowEmptyCompartments value="0"/>
-						<ashowEllipsisForUnshownMembers value="0"/>
-						<ashowAttributesCodeDetails value="0"/>
-						<ashowOperationsCodeDetails value="0"/>
-						<ashowParametersCodeDetails value="0"/>
-						<ashowTypeOption value="0"/>
-						<ashowOwnerOption value="3"/>
-						<ashowAttributesType value="0"/>
-						<ashowOperationsParameters value="0"/>
-						<ashowOperationsReturnType value="0"/>
-					</properties>
-				</xmi:Extension>
-				<elementFill color1="Cr:122,207,245,255" color2="" style="1" transparency="0" type="1"/>
-				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
-				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
-			</uml:DiagramElement>
-			<uml:DiagramElement geometry="420,139;420,110;480,110;480,165;440,165;" preferredShapeType="Association" subject="LrnLWuyEwTiAAggO" xmi:id="LrnLWuyEwTiAAggT">
-				<xmi:Extension extender="Visual Paradigm for UML">
-					<captionBounds value="450,94,108,14"/>
+			<uml:DiagramElement geometry="420,131;420,102;480,102;480,157;440,157;" preferredShapeType="Association" subject="LrnLWuyEwTiAAggO" xmi:id="LrnLWuyEwTiAAggT">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<captionBounds value="476,114,108,14"/>
 					<captionInternalWidth value="-2147483648"/>
 					<captionInternalHeight value="-2147483648"/>
 					<captionVisible value="true"/>
@@ -10212,7 +10491,7 @@
 					<properties>
 						<abackground value="Cr:192,192,192,255"/>
 						<aforeground value="Cr:0,0,0,255"/>
-						<azOrder value="15"/>
+						<azOrder value="17"/>
 						<acreatorDiagramType value="ClassDiagram"/>
 						<aselectable value="true"/>
 						<arequestResetCaption value="false"/>
@@ -10267,9 +10546,9 @@
 				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
 				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
 			</uml:DiagramElement>
-			<uml:DiagramElement geometry="467,165;467,239;" preferredShapeType="AssociationClass" subject="fBMrWuyEwTiAAggi" xmi:id="fBMrWuyEwTiAAggj">
-				<xmi:Extension extender="Visual Paradigm for UML">
-					<captionBounds value="461,214,20,0"/>
+			<uml:DiagramElement geometry="467,157;467,239;" preferredShapeType="AssociationClass" subject="fBMrWuyEwTiAAggi" xmi:id="fBMrWuyEwTiAAggj">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<captionBounds value="461,211,20,0"/>
 					<captionInternalWidth value="-2147483648"/>
 					<captionInternalHeight value="-2147483648"/>
 					<captionVisible value="true"/>
@@ -10312,7 +10591,7 @@
 					<properties>
 						<abackground value="Cr:192,192,192,255"/>
 						<aforeground value="Cr:0,0,0,255"/>
-						<azOrder value="13"/>
+						<azOrder value="15"/>
 						<aselectable value="true"/>
 						<arequestResetCaption value="false"/>
 						<arequestResetCaptionSize value="false"/>
@@ -10376,7 +10655,7 @@
 					<properties>
 						<abackground value="Cr:192,192,192,255"/>
 						<aforeground value="Cr:0,0,0,255"/>
-						<azOrder value="11"/>
+						<azOrder value="13"/>
 						<aselectable value="true"/>
 						<arequestResetCaption value="false"/>
 						<arequestResetCaptionSize value="false"/>
@@ -10430,9 +10709,9 @@
 				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
 				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
 			</uml:DiagramElement>
-			<uml:DiagramElement geometry="570,241;700,169;" preferredShapeType="Association" subject="pJ.rWuyEwTiAAghI" xmi:id="pJ.rWuyEwTiAAghN">
-				<xmi:Extension extender="Visual Paradigm for UML">
-					<captionBounds value="617,176,58,14"/>
+			<uml:DiagramElement geometry="570,241;700,187;" preferredShapeType="Association" subject="pJ.rWuyEwTiAAghI" xmi:id="pJ.rWuyEwTiAAghN">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<captionBounds value="624,216,58,14"/>
 					<captionInternalWidth value="-2147483648"/>
 					<captionInternalHeight value="-2147483648"/>
 					<captionVisible value="true"/>
@@ -10624,9 +10903,9 @@
 				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
 				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
 			</uml:DiagramElement>
-			<uml:DiagramElement geometry="344,380,120,40" preferredShapeType="Class" subject="iwsbWuyEwTiAAgiT" xmi:id="iwsbWuyEwTiAAgiS">
-				<xmi:Extension extender="Visual Paradigm for UML">
-					<captionBounds value="0,0,120,14"/>
+			<uml:DiagramElement geometry="344,380,105,40" preferredShapeType="Class" subject="iwsbWuyEwTiAAgiT" xmi:id="iwsbWuyEwTiAAgiS">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<captionBounds value="0,0,105,28"/>
 					<captionInternalWidth value="-2147483648"/>
 					<captionInternalHeight value="-2147483648"/>
 					<captionVisible value="true"/>
@@ -10634,7 +10913,7 @@
 					<properties>
 						<abackground value="Cr:192,192,192,255"/>
 						<aforeground value="Cr:0,0,0,255"/>
-						<azOrder value="9"/>
+						<azOrder value="11"/>
 						<acreatorDiagramType value="ClassDiagram"/>
 						<aselectable value="true"/>
 						<arequestResetCaption value="false"/>
@@ -10689,9 +10968,9 @@
 				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
 				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
 			</uml:DiagramElement>
-			<uml:DiagramElement geometry="460,290;460,379;" preferredShapeType="Generalization" subject="c8WbWuyEwTiAAgig" xmi:id="c8WbWuyEwTiAAgih">
-				<xmi:Extension extender="Visual Paradigm for UML">
-					<captionBounds value="458,329,20,0"/>
+			<uml:DiagramElement geometry="460,290;448,380;" preferredShapeType="Generalization" subject="c8WbWuyEwTiAAgig" xmi:id="c8WbWuyEwTiAAgih">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<captionBounds value="453,330,20,0"/>
 					<captionInternalWidth value="-2147483648"/>
 					<captionInternalHeight value="-2147483648"/>
 					<captionVisible value="true"/>
@@ -10725,9 +11004,9 @@
 				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
 				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
 			</uml:DiagramElement>
-			<uml:DiagramElement geometry="410,139;410,44;314,44;314,160;359,160;" preferredShapeType="Association" subject="77xbWuyEwTiAAgi0" xmi:id="H7xbWuyEwTiAAgi5">
-				<xmi:Extension extender="Visual Paradigm for UML">
-					<captionBounds value="322,28,97,14"/>
+			<uml:DiagramElement geometry="410,131;410,36;314,36;314,152;359,152;" preferredShapeType="Association" subject="77xbWuyEwTiAAgi0" xmi:id="H7xbWuyEwTiAAgi5">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<captionBounds value="288,18,97,14"/>
 					<captionInternalWidth value="-2147483648"/>
 					<captionInternalHeight value="-2147483648"/>
 					<captionVisible value="true"/>
@@ -10789,44 +11068,44 @@
 				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
 				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
 			</uml:DiagramElement>
-			<uml:DiagramElement geometry="350,160;350,379;" preferredShapeType="AssociationClass" subject="bCjbWuyEwTiAAgjB" xmi:id="bCjbWuyEwTiAAgjC">
-				<xmi:Extension extender="Visual Paradigm for UML">
-					<captionBounds value="361,290,20,0"/>
-					<captionInternalWidth value="-2147483648"/>
-					<captionInternalHeight value="-2147483648"/>
-					<captionVisible value="true"/>
-					<captionSide value="1"/>
-					<properties>
-						<abackground value="Cr:122,207,245,255"/>
-						<aforeground value="Cr:0,0,0,255"/>
-						<azOrder value="-1"/>
-						<aselectable value="true"/>
-						<arequestResetCaption value="false"/>
-						<arequestResetCaptionSize value="false"/>
-						<aconnectorStyle value="3"/>
-						<aconnectorLineJumps value="4"/>
-						<aconnectorLabelOrientation value="4"/>
-						<afromShapeXDiff value="0"/>
-						<afromShapeYDiff value="0"/>
-						<atoShapeXDiff value="0"/>
-						<atoShapeYDiff value="0"/>
-						<afromConnectType value="0"/>
-						<atoConnectType value="0"/>
-						<auseFromShapeCenter value="true"/>
-						<auseToShapeCenter value="true"/>
-						<afromPinType value="1"/>
-						<atoPinType value="1"/>
-						<arequestRebuild value="false"/>
-						<ashowConnectorName value="2"/>
-						<apaintThroughLabel value="2"/>
-					</properties>
-				</xmi:Extension>
-				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
-				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
-			</uml:DiagramElement>
-			<uml:DiagramElement geometry="390,139;390,61;286,61;286,170;359,170;" preferredShapeType="Association" subject="gi8U.uyCiu1SNwYm" xmi:id="gi8U.uyCiu1SNwYr">
-				<xmi:Extension extender="Visual Paradigm for UML">
-					<captionBounds value="203,44,107,14"/>
+			<uml:DiagramElement geometry="350,152;350,379;" preferredShapeType="AssociationClass" subject="bCjbWuyEwTiAAgjB" xmi:id="bCjbWuyEwTiAAgjC">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<captionBounds value="361,287,20,0"/>
+					<captionInternalWidth value="-2147483648"/>
+					<captionInternalHeight value="-2147483648"/>
+					<captionVisible value="true"/>
+					<captionSide value="1"/>
+					<properties>
+						<abackground value="Cr:122,207,245,255"/>
+						<aforeground value="Cr:0,0,0,255"/>
+						<azOrder value="-1"/>
+						<aselectable value="true"/>
+						<arequestResetCaption value="false"/>
+						<arequestResetCaptionSize value="false"/>
+						<aconnectorStyle value="3"/>
+						<aconnectorLineJumps value="4"/>
+						<aconnectorLabelOrientation value="4"/>
+						<afromShapeXDiff value="0"/>
+						<afromShapeYDiff value="0"/>
+						<atoShapeXDiff value="0"/>
+						<atoShapeYDiff value="0"/>
+						<afromConnectType value="0"/>
+						<atoConnectType value="0"/>
+						<auseFromShapeCenter value="true"/>
+						<auseToShapeCenter value="true"/>
+						<afromPinType value="1"/>
+						<atoPinType value="1"/>
+						<arequestRebuild value="false"/>
+						<ashowConnectorName value="2"/>
+						<apaintThroughLabel value="2"/>
+					</properties>
+				</xmi:Extension>
+				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
+				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
+			</uml:DiagramElement>
+			<uml:DiagramElement geometry="390,131;390,53;286,53;286,162;359,162;" preferredShapeType="Association" subject="gi8U.uyCiu1SNwYm" xmi:id="gi8U.uyCiu1SNwYr">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<captionBounds value="206,37,107,14"/>
 					<captionInternalWidth value="-2147483648"/>
 					<captionInternalHeight value="-2147483648"/>
 					<captionVisible value="true"/>
@@ -10888,9 +11167,9 @@
 				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
 				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
 			</uml:DiagramElement>
-			<uml:DiagramElement geometry="380,139;380,79;264,79;264,180;359,180;" preferredShapeType="Association" subject="D2RU.uyCiu1SNwZA" xmi:id="j2RU.uyCiu1SNwZF">
-				<xmi:Extension extender="Visual Paradigm for UML">
-					<captionBounds value="144,90,118,14"/>
+			<uml:DiagramElement geometry="380,131;380,71;264,71;264,172;359,172;" preferredShapeType="Association" subject="D2RU.uyCiu1SNwZA" xmi:id="j2RU.uyCiu1SNwZF">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<captionBounds value="164,54,118,14"/>
 					<captionInternalWidth value="-2147483648"/>
 					<captionInternalHeight value="-2147483648"/>
 					<captionVisible value="true"/>
@@ -10952,9 +11231,74 @@
 				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
 				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
 			</uml:DiagramElement>
-			<uml:DiagramElement geometry="213,380,120,40" preferredShapeType="Class" subject="ZKXU.uyCiu1SNwZb" xmi:id="ZKXU.uyCiu1SNwZa">
-				<xmi:Extension extender="Visual Paradigm for UML">
-					<captionBounds value="0,0,120,14"/>
+			<uml:DiagramElement geometry="213,380,113,40" preferredShapeType="Class" subject="ZKXU.uyCiu1SNwZb" xmi:id="ZKXU.uyCiu1SNwZa">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<captionBounds value="0,0,113,28"/>
+					<captionInternalWidth value="-2147483648"/>
+					<captionInternalHeight value="-2147483648"/>
+					<captionVisible value="true"/>
+					<captionSide value="12"/>
+					<properties>
+						<abackground value="Cr:192,192,192,255"/>
+						<aforeground value="Cr:0,0,0,255"/>
+						<azOrder value="7"/>
+						<acreatorDiagramType value="ClassDiagram"/>
+						<aselectable value="true"/>
+						<arequestResetCaption value="false"/>
+						<arequestResetCaptionSize value="false"/>
+						<adisplayStereotypeIcon value="false"/>
+						<aoverrideAppearanceWithStereotypeIcon value="true"/>
+						<arequestSetSizeOption value="0"/>
+						<aparentConnectorHeaderLength value="40"/>
+						<aparentConnectorLineLength value="10"/>
+						<aconnectToPoint value="true"/>
+						<aparentConnectorDTheta value="0.0"/>
+						<aconnectionPointType value="2"/>
+						<amodelElementNameAlignment value="9"/>
+						<arequestDefaultSize value="false"/>
+						<arequestFitSize value="false"/>
+						<arequestFitSizeFromCenter value="false"/>
+						<adisplayAsRobustnessAnalysisIcon value="true"/>
+						<avisibilityStyle value="1"/>
+						<ashowAttributeType value="1"/>
+						<ashowOperationType value="1"/>
+						<amSwTpPts value="true"/>
+						<alshRfAts value="true"/>
+						<amShDrAt value="false"/>
+						<akShDrOp value="false"/>
+						<akSwCsMbSt value="true"/>
+						<ashowClassMemberConstraints value="true"/>
+						<alShCmMl value="false"/>
+						<ashowOperationParameterDirection value="false"/>
+						<ashowOperationRaisedExceptions value="false"/>
+						<ashowParameterNameInOperationSignature value="true"/>
+						<ashowOperationTemplateParameters value="false"/>
+						<ashowOperationProperties value="false"/>
+						<awpMbs value="false"/>
+						<aattributeSortType value="0"/>
+						<aoperationSortType value="0"/>
+						<ashowInitialAttributeValue value="true"/>
+						<ashowOperationSignature value="true"/>
+						<ainterfaceBall value="false"/>
+						<ashowEmptyCompartments value="0"/>
+						<ashowEllipsisForUnshownMembers value="0"/>
+						<ashowAttributesCodeDetails value="0"/>
+						<ashowOperationsCodeDetails value="0"/>
+						<ashowParametersCodeDetails value="0"/>
+						<ashowTypeOption value="0"/>
+						<ashowOwnerOption value="3"/>
+						<ashowAttributesType value="0"/>
+						<ashowOperationsParameters value="0"/>
+						<ashowOperationsReturnType value="0"/>
+					</properties>
+				</xmi:Extension>
+				<elementFill color1="Cr:192,192,192,255" color2="" style="1" transparency="0" type="1"/>
+				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
+				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
+			</uml:DiagramElement>
+			<uml:DiagramElement geometry="70,380,125,40" preferredShapeType="Class" subject="W8Q0.uyCiu1SNwZl" xmi:id="W8Q0.uyCiu1SNwZk">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<captionBounds value="0,0,125,28"/>
 					<captionInternalWidth value="-2147483648"/>
 					<captionInternalHeight value="-2147483648"/>
 					<captionVisible value="true"/>
@@ -11017,9 +11361,365 @@
 				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
 				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
 			</uml:DiagramElement>
-			<uml:DiagramElement geometry="70,380,130,40" preferredShapeType="Class" subject="W8Q0.uyCiu1SNwZl" xmi:id="W8Q0.uyCiu1SNwZk">
-				<xmi:Extension extender="Visual Paradigm for UML">
-					<captionBounds value="0,0,130,14"/>
+			<uml:DiagramElement geometry="450,290;326,380;" preferredShapeType="Generalization" subject="6eo0.uyCiu1SNwZp" xmi:id="6eo0.uyCiu1SNwZq">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<captionBounds value="378,330,20,0"/>
+					<captionInternalWidth value="-2147483648"/>
+					<captionInternalHeight value="-2147483648"/>
+					<captionVisible value="true"/>
+					<captionSide value="1"/>
+					<properties>
+						<abackground value="Cr:255,255,255,255"/>
+						<aforeground value="Cr:0,0,0,255"/>
+						<azOrder value="-1"/>
+						<acreatorDiagramType value="ClassDiagram"/>
+						<aselectable value="true"/>
+						<arequestResetCaption value="false"/>
+						<arequestResetCaptionSize value="false"/>
+						<aconnectorStyle value="3"/>
+						<aconnectorLineJumps value="4"/>
+						<aconnectorLabelOrientation value="4"/>
+						<afromShapeXDiff value="0"/>
+						<afromShapeYDiff value="0"/>
+						<atoShapeXDiff value="0"/>
+						<atoShapeYDiff value="0"/>
+						<afromConnectType value="0"/>
+						<atoConnectType value="0"/>
+						<auseFromShapeCenter value="true"/>
+						<auseToShapeCenter value="true"/>
+						<afromPinType value="1"/>
+						<atoPinType value="1"/>
+						<arequestRebuild value="false"/>
+						<ashowConnectorName value="2"/>
+						<apaintThroughLabel value="2"/>
+					</properties>
+				</xmi:Extension>
+				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
+				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
+			</uml:DiagramElement>
+			<uml:DiagramElement geometry="450,272;195,381;" preferredShapeType="Generalization" subject="cW40.uyCiu1SNwZt" xmi:id="8W40.uyCiu1SNwZu">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<captionBounds value="313,326,20,0"/>
+					<captionInternalWidth value="-2147483648"/>
+					<captionInternalHeight value="-2147483648"/>
+					<captionVisible value="true"/>
+					<captionSide value="1"/>
+					<properties>
+						<abackground value="Cr:255,255,255,255"/>
+						<aforeground value="Cr:0,0,0,255"/>
+						<azOrder value="-1"/>
+						<acreatorDiagramType value="ClassDiagram"/>
+						<aselectable value="true"/>
+						<arequestResetCaption value="false"/>
+						<arequestResetCaptionSize value="false"/>
+						<aconnectorStyle value="3"/>
+						<aconnectorLineJumps value="4"/>
+						<aconnectorLabelOrientation value="4"/>
+						<afromShapeXDiff value="0"/>
+						<afromShapeYDiff value="0"/>
+						<atoShapeXDiff value="0"/>
+						<atoShapeYDiff value="0"/>
+						<afromConnectType value="0"/>
+						<atoConnectType value="0"/>
+						<auseFromShapeCenter value="true"/>
+						<auseToShapeCenter value="true"/>
+						<afromPinType value="1"/>
+						<atoPinType value="1"/>
+						<arequestRebuild value="false"/>
+						<ashowConnectorName value="2"/>
+						<apaintThroughLabel value="2"/>
+					</properties>
+				</xmi:Extension>
+				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
+				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
+			</uml:DiagramElement>
+			<uml:DiagramElement geometry="299,162;299,379;" preferredShapeType="AssociationClass" subject="tqk0.uyCiu1SNwZx" xmi:id="tqk0.uyCiu1SNwZy">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<captionBounds value="314,285,20,0"/>
+					<captionInternalWidth value="-2147483648"/>
+					<captionInternalHeight value="-2147483648"/>
+					<captionVisible value="true"/>
+					<captionSide value="1"/>
+					<properties>
+						<abackground value="Cr:122,207,245,255"/>
+						<aforeground value="Cr:0,0,0,255"/>
+						<azOrder value="-1"/>
+						<aselectable value="true"/>
+						<arequestResetCaption value="false"/>
+						<arequestResetCaptionSize value="false"/>
+						<aconnectorStyle value="3"/>
+						<aconnectorLineJumps value="4"/>
+						<aconnectorLabelOrientation value="4"/>
+						<afromShapeXDiff value="0"/>
+						<afromShapeYDiff value="0"/>
+						<atoShapeXDiff value="0"/>
+						<atoShapeYDiff value="0"/>
+						<afromConnectType value="0"/>
+						<atoConnectType value="0"/>
+						<auseFromShapeCenter value="true"/>
+						<auseToShapeCenter value="true"/>
+						<afromPinType value="1"/>
+						<atoPinType value="1"/>
+						<arequestRebuild value="false"/>
+						<ashowConnectorName value="2"/>
+						<apaintThroughLabel value="2"/>
+					</properties>
+				</xmi:Extension>
+				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
+				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
+			</uml:DiagramElement>
+			<uml:DiagramElement geometry="274,172;194,380;" preferredShapeType="AssociationClass" subject="blc0.uyCiu1SNwZ3" xmi:id="7lc0.uyCiu1SNwZ4">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<captionBounds value="251,282,20,0"/>
+					<captionInternalWidth value="-2147483648"/>
+					<captionInternalHeight value="-2147483648"/>
+					<captionVisible value="true"/>
+					<captionSide value="1"/>
+					<properties>
+						<abackground value="Cr:122,207,245,255"/>
+						<aforeground value="Cr:0,0,0,255"/>
+						<azOrder value="-1"/>
+						<aselectable value="true"/>
+						<arequestResetCaption value="false"/>
+						<arequestResetCaptionSize value="false"/>
+						<aconnectorStyle value="3"/>
+						<aconnectorLineJumps value="4"/>
+						<aconnectorLabelOrientation value="4"/>
+						<afromShapeXDiff value="0"/>
+						<afromShapeYDiff value="0"/>
+						<atoShapeXDiff value="0"/>
+						<atoShapeYDiff value="0"/>
+						<afromConnectType value="0"/>
+						<atoConnectType value="0"/>
+						<auseFromShapeCenter value="true"/>
+						<auseToShapeCenter value="true"/>
+						<afromPinType value="1"/>
+						<atoPinType value="1"/>
+						<arequestRebuild value="false"/>
+						<ashowConnectorName value="2"/>
+						<apaintThroughLabel value="2"/>
+					</properties>
+				</xmi:Extension>
+				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
+				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
+			</uml:DiagramElement>
+			<uml:DiagramElement geometry="560,0,159,71" preferredShapeType="NOTE" subject="afB2HuyCiu1SNxHe" xmi:id="kb6uHuyCiu1SNxJN">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<captionBounds value="0,0,159,0"/>
+					<captionInternalWidth value="-2147483648"/>
+					<captionInternalHeight value="-2147483648"/>
+					<captionVisible value="true"/>
+					<captionSide value="12"/>
+					<properties>
+						<abackground value="Cr:255,255,192,127"/>
+						<aforeground value="Cr:0,0,0,255"/>
+						<azOrder value="2"/>
+						<aselectable value="true"/>
+						<arequestResetCaption value="false"/>
+						<arequestResetCaptionSize value="false"/>
+						<adisplayStereotypeIcon value="false"/>
+						<aoverrideAppearanceWithStereotypeIcon value="true"/>
+						<arequestSetSizeOption value="0"/>
+						<aparentConnectorHeaderLength value="40"/>
+						<aparentConnectorLineLength value="10"/>
+						<aconnectToPoint value="true"/>
+						<aparentConnectorDTheta value="0.0"/>
+						<aconnectionPointType value="2"/>
+						<amodelElementNameAlignment value="9"/>
+						<arequestDefaultSize value="false"/>
+						<arequestFitSize value="false"/>
+						<arequestFitSizeFromCenter value="false"/>
+						<aangle value="0"/>
+					</properties>
+				</xmi:Extension>
+				<elementFill color1="Cr:255,255,192,127" color2="" style="1" transparency="50" type="1"/>
+				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
+				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
+			</uml:DiagramElement>
+			<uml:DiagramElement geometry="310,83,500,127" preferredShapeType="SECurveShape" subject="yr2uHuyCiu1SNxJW" xmi:id="yr2uHuyCiu1SNxJV">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<captionBounds value="0,0,40,40"/>
+					<captionInternalWidth value="-2147483648"/>
+					<captionInternalHeight value="-2147483648"/>
+					<captionVisible value="false"/>
+					<captionSide value="7"/>
+					<properties>
+						<abackground value="Cr:255,255,192,127"/>
+						<aforeground value="Cr:192,192,192,255"/>
+						<azOrder value="23"/>
+						<aselectable value="true"/>
+						<arequestResetCaption value="false"/>
+						<arequestResetCaptionSize value="false"/>
+						<adisplayStereotypeIcon value="false"/>
+						<aoverrideAppearanceWithStereotypeIcon value="true"/>
+						<arequestSetSizeOption value="0"/>
+						<aparentConnectorHeaderLength value="40"/>
+						<aparentConnectorLineLength value="10"/>
+						<aconnectToPoint value="true"/>
+						<aparentConnectorDTheta value="0.0"/>
+						<aconnectionPointType value="2"/>
+						<amodelElementNameAlignment value="9"/>
+						<arequestDefaultSize value="false"/>
+						<arequestFitSize value="false"/>
+						<arequestFitSizeFromCenter value="false"/>
+						<aobjectId value="20"/>
+						<aobjectType value="9096"/>
+						<anotUseVisibleBounds value="false"/>
+						<aalpha value="1.0"/>
+						<arotateAngle value="0.0"/>
+						<anodeName value="VPCurveShape"/>
+						<aactConnector value="true"/>
+						<adrawBy value="3"/>
+					</properties>
+					<FontFormat fontColor="Cr:0,0,0,255">
+						<Font name="Dialog" size="11" style="0"/>
+					</FontFormat>
+					<Label location="Pt:560.0,146.49999999999997" text=""/>
+					<Label transparency="0" tx="0.0" ty="0.0" type="0">
+						<FillFormat renderStyle="1">
+							<AffineTransformMatrix>
+								<Matrix value="1.9999999999999976"/>
+								<Matrix value="0.0"/>
+								<Matrix value="0.0"/>
+								<Matrix value="0.8839285714285712"/>
+								<Matrix value="-323.999999999999"/>
+								<Matrix value="13.026785714285694"/>
+							</AffineTransformMatrix>
+							<Render color="Cr:0,0,0,255"/>
+						</FillFormat>
+					</Label>
+					<ShapeBasePoint point="Pt:560.0,146.5"/>
+					<Arrow endArrow="0" startArrow="0"/>
+					<LineFormat color="Cr:192,192,192,255" style="91" width="1.0">
+						<Stroke cap="0" dashPhase="0.0" join="0" miterlimit="10.0" type="0" width="1.0"/>
+					</LineFormat>
+					<FillFormat renderStyle="1">
+						<AffineTransformMatrix>
+							<Matrix value="1.9999999999999976"/>
+							<Matrix value="0.0"/>
+							<Matrix value="0.0"/>
+							<Matrix value="0.8839285714285712"/>
+							<Matrix value="-323.999999999999"/>
+							<Matrix value="13.026785714285694"/>
+						</AffineTransformMatrix>
+						<Render color="Cr:255,255,192,127"/>
+					</FillFormat>
+					<CurveList windingRule="1">
+						<Curves>
+							<Curve controlPoint1="Pt:442.0,97.0" controlPoint2="Pt:678.0,97.0" endPoint="Pt:796.0,97.0" objectId="1" startPoint="Pt:324.0,97.0"/>
+							<Curve controlPoint1="Pt:796.0,121.75" controlPoint2="Pt:796.0,171.25" endPoint="Pt:796.0,196.0" objectId="2" startPoint="Pt:796.0,97.0"/>
+							<Curve controlPoint1="Pt:678.0,196.0" controlPoint2="Pt:442.0,196.0" endPoint="Pt:324.0,196.0" objectId="3" startPoint="Pt:796.0,196.0"/>
+							<Curve controlPoint1="Pt:324.0,171.25" controlPoint2="Pt:324.0,121.75" endPoint="Pt:324.0,97.0" objectId="4" startPoint="Pt:324.0,196.0"/>
+						</Curves>
+					</CurveList>
+				</xmi:Extension>
+				<elementFill color1="Cr:255,255,192,127" color2="" style="1" transparency="50" type="1"/>
+				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
+				<elementLine color="Cr:192,192,192,255" style="1" transparency="0" weight="1.0"/>
+			</uml:DiagramElement>
+			<uml:DiagramElement geometry="718,71;718,83;" preferredShapeType="Anchor" subject="qlVuHuyCiu1SNxJg" xmi:id="qlVuHuyCiu1SNxJh">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<captionBounds value="708,77,20,0"/>
+					<captionInternalWidth value="-2147483648"/>
+					<captionInternalHeight value="-2147483648"/>
+					<captionVisible value="true"/>
+					<captionSide value="1"/>
+					<properties>
+						<abackground value="Cr:122,207,245,255"/>
+						<aforeground value="Cr:0,0,0,255"/>
+						<azOrder value="-1"/>
+						<acreatorDiagramType value="ClassDiagram"/>
+						<aselectable value="true"/>
+						<arequestResetCaption value="false"/>
+						<arequestResetCaptionSize value="false"/>
+						<aconnectorStyle value="3"/>
+						<aconnectorLineJumps value="4"/>
+						<aconnectorLabelOrientation value="4"/>
+						<afromShapeXDiff value="0"/>
+						<afromShapeYDiff value="0"/>
+						<atoShapeXDiff value="0"/>
+						<atoShapeYDiff value="0"/>
+						<afromConnectType value="0"/>
+						<atoConnectType value="0"/>
+						<auseFromShapeCenter value="true"/>
+						<auseToShapeCenter value="true"/>
+						<afromPinType value="1"/>
+						<atoPinType value="1"/>
+						<arequestRebuild value="false"/>
+						<ashowConnectorName value="2"/>
+						<apaintThroughLabel value="2"/>
+					</properties>
+				</xmi:Extension>
+				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
+				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
+			</uml:DiagramElement>
+			<uml:DiagramElement geometry="368,131;368,89;235,89;235,183;359,183;" preferredShapeType="Association" subject="pKq8nuyCiu1SNxPl" xmi:id="1Kq8nuyCiu1SNxPq">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<captionBounds value="182,72,67,14"/>
+					<captionInternalWidth value="-2147483648"/>
+					<captionInternalHeight value="-2147483648"/>
+					<captionVisible value="true"/>
+					<captionSide value="1"/>
+					<properties>
+						<abackground value="Cr:122,207,245,255"/>
+						<aforeground value="Cr:0,0,0,255"/>
+						<azOrder value="-1"/>
+						<acreatorDiagramType value="ClassDiagram"/>
+						<aselectable value="true"/>
+						<arequestResetCaption value="false"/>
+						<arequestResetCaptionSize value="false"/>
+						<aconnectorStyle value="3"/>
+						<aconnectorLineJumps value="4"/>
+						<aconnectorLabelOrientation value="4"/>
+						<afromShapeXDiff value="0"/>
+						<afromShapeYDiff value="0"/>
+						<atoShapeXDiff value="0"/>
+						<atoShapeYDiff value="0"/>
+						<afromConnectType value="0"/>
+						<atoConnectType value="0"/>
+						<auseFromShapeCenter value="true"/>
+						<auseToShapeCenter value="true"/>
+						<afromPinType value="1"/>
+						<atoPinType value="1"/>
+						<arequestRebuild value="false"/>
+						<ashowConnectorName value="2"/>
+						<apaintThroughLabel value="2"/>
+						<ahasRoleAShape value="false"/>
+						<ahasRoleBShape value="false"/>
+						<ashowMultiplicityConstraints value="false"/>
+						<ahasMultiplicityAShape value="false"/>
+						<ahasMultiplicityBShape value="false"/>
+						<a0SwDr value="false"/>
+						<ashowStereotypes value="true"/>
+						<ashowFromRoleName value="true"/>
+						<ashowToRoleName value="true"/>
+						<ashowFromMultiplicity value="true"/>
+						<ashowToMultiplicity value="true"/>
+						<ashowFromRoleVisibility value="true"/>
+						<ashowToRoleVisibility value="true"/>
+						<ashowAssociationEndPropertyStrings value="false"/>
+						<ahasAssociationEndPropertyStringsAShape value="false"/>
+						<ahasAssociationEndPropertyStringsBShape value="false"/>
+						<afromRoleInternalWidth value="-2147483648"/>
+						<afromRoleInternalHeight value="-2147483648"/>
+						<atoRoleInternalWidth value="-2147483648"/>
+						<atoRoleInternalHeight value="-2147483648"/>
+						<afromMultiplicityInternalWidth value="-2147483648"/>
+						<afromMultiplicityInternalHeight value="-2147483648"/>
+						<atoMultiplicityInternalWidth value="-2147483648"/>
+						<atoMultiplicityInternalHeight value="-2147483648"/>
+						<aassociationEndPropertyStringsAInternalWidth value="-2147483648"/>
+						<aassociationEndPropertyStringsAInternalHeight value="-2147483648"/>
+						<aassociationEndPropertyStringsBInternalWidth value="-2147483648"/>
+						<aassociationEndPropertyStringsBInternalHeight value="-2147483648"/>
+					</properties>
+				</xmi:Extension>
+				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
+				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
+			</uml:DiagramElement>
+			<uml:DiagramElement geometry="96,301,80,40" preferredShapeType="Class" subject="Ftn8nuyCiu1SNxQP" xmi:id="5tn8nuyCiu1SNxQO">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<captionBounds value="0,0,80,14"/>
 					<captionInternalWidth value="-2147483648"/>
 					<captionInternalHeight value="-2147483648"/>
 					<captionVisible value="true"/>
@@ -11027,7 +11727,7 @@
 					<properties>
 						<abackground value="Cr:192,192,192,255"/>
 						<aforeground value="Cr:0,0,0,255"/>
-						<azOrder value="3"/>
+						<azOrder value="0"/>
 						<acreatorDiagramType value="ClassDiagram"/>
 						<aselectable value="true"/>
 						<arequestResetCaption value="false"/>
@@ -11082,274 +11782,17 @@
 				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
 				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
 			</uml:DiagramElement>
-			<uml:DiagramElement geometry="450,290;333,380;" preferredShapeType="Generalization" subject="6eo0.uyCiu1SNwZp" xmi:id="6eo0.uyCiu1SNwZq">
-				<xmi:Extension extender="Visual Paradigm for UML">
-					<captionBounds value="382,330,20,0"/>
-					<captionInternalWidth value="-2147483648"/>
-					<captionInternalHeight value="-2147483648"/>
-					<captionVisible value="true"/>
-					<captionSide value="1"/>
-					<properties>
-						<abackground value="Cr:255,255,255,255"/>
-						<aforeground value="Cr:0,0,0,255"/>
-						<azOrder value="-1"/>
-						<acreatorDiagramType value="ClassDiagram"/>
-						<aselectable value="true"/>
-						<arequestResetCaption value="false"/>
-						<arequestResetCaptionSize value="false"/>
-						<aconnectorStyle value="3"/>
-						<aconnectorLineJumps value="4"/>
-						<aconnectorLabelOrientation value="4"/>
-						<afromShapeXDiff value="0"/>
-						<afromShapeYDiff value="0"/>
-						<atoShapeXDiff value="0"/>
-						<atoShapeYDiff value="0"/>
-						<afromConnectType value="0"/>
-						<atoConnectType value="0"/>
-						<auseFromShapeCenter value="true"/>
-						<auseToShapeCenter value="true"/>
-						<afromPinType value="1"/>
-						<atoPinType value="1"/>
-						<arequestRebuild value="false"/>
-						<ashowConnectorName value="2"/>
-						<apaintThroughLabel value="2"/>
-					</properties>
-				</xmi:Extension>
-				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
-				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
-			</uml:DiagramElement>
-			<uml:DiagramElement geometry="450,270;200,381;" preferredShapeType="Generalization" subject="cW40.uyCiu1SNwZt" xmi:id="8W40.uyCiu1SNwZu">
-				<xmi:Extension extender="Visual Paradigm for UML">
-					<captionBounds value="316,320,20,0"/>
-					<captionInternalWidth value="-2147483648"/>
-					<captionInternalHeight value="-2147483648"/>
-					<captionVisible value="true"/>
-					<captionSide value="1"/>
-					<properties>
-						<abackground value="Cr:255,255,255,255"/>
-						<aforeground value="Cr:0,0,0,255"/>
-						<azOrder value="-1"/>
-						<acreatorDiagramType value="ClassDiagram"/>
-						<aselectable value="true"/>
-						<arequestResetCaption value="false"/>
-						<arequestResetCaptionSize value="false"/>
-						<aconnectorStyle value="3"/>
-						<aconnectorLineJumps value="4"/>
-						<aconnectorLabelOrientation value="4"/>
-						<afromShapeXDiff value="0"/>
-						<afromShapeYDiff value="0"/>
-						<atoShapeXDiff value="0"/>
-						<atoShapeYDiff value="0"/>
-						<afromConnectType value="0"/>
-						<atoConnectType value="0"/>
-						<auseFromShapeCenter value="true"/>
-						<auseToShapeCenter value="true"/>
-						<afromPinType value="1"/>
-						<atoPinType value="1"/>
-						<arequestRebuild value="false"/>
-						<ashowConnectorName value="2"/>
-						<apaintThroughLabel value="2"/>
-					</properties>
-				</xmi:Extension>
-				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
-				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
-			</uml:DiagramElement>
-			<uml:DiagramElement geometry="299,170;299,379;" preferredShapeType="AssociationClass" subject="tqk0.uyCiu1SNwZx" xmi:id="tqk0.uyCiu1SNwZy">
-				<xmi:Extension extender="Visual Paradigm for UML">
-					<captionBounds value="314,288,20,0"/>
-					<captionInternalWidth value="-2147483648"/>
-					<captionInternalHeight value="-2147483648"/>
-					<captionVisible value="true"/>
-					<captionSide value="1"/>
-					<properties>
-						<abackground value="Cr:122,207,245,255"/>
-						<aforeground value="Cr:0,0,0,255"/>
-						<azOrder value="-1"/>
-						<aselectable value="true"/>
-						<arequestResetCaption value="false"/>
-						<arequestResetCaptionSize value="false"/>
-						<aconnectorStyle value="3"/>
-						<aconnectorLineJumps value="4"/>
-						<aconnectorLabelOrientation value="4"/>
-						<afromShapeXDiff value="0"/>
-						<afromShapeYDiff value="0"/>
-						<atoShapeXDiff value="0"/>
-						<atoShapeYDiff value="0"/>
-						<afromConnectType value="0"/>
-						<atoConnectType value="0"/>
-						<auseFromShapeCenter value="true"/>
-						<auseToShapeCenter value="true"/>
-						<afromPinType value="1"/>
-						<atoPinType value="1"/>
-						<arequestRebuild value="false"/>
-						<ashowConnectorName value="2"/>
-						<apaintThroughLabel value="2"/>
-					</properties>
-				</xmi:Extension>
-				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
-				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
-			</uml:DiagramElement>
-			<uml:DiagramElement geometry="274,180;178,380;" preferredShapeType="AssociationClass" subject="blc0.uyCiu1SNwZ3" xmi:id="7lc0.uyCiu1SNwZ4">
-				<xmi:Extension extender="Visual Paradigm for UML">
-					<captionBounds value="242,291,20,0"/>
-					<captionInternalWidth value="-2147483648"/>
-					<captionInternalHeight value="-2147483648"/>
-					<captionVisible value="true"/>
-					<captionSide value="1"/>
-					<properties>
-						<abackground value="Cr:122,207,245,255"/>
-						<aforeground value="Cr:0,0,0,255"/>
-						<azOrder value="-1"/>
-						<aselectable value="true"/>
-						<arequestResetCaption value="false"/>
-						<arequestResetCaptionSize value="false"/>
-						<aconnectorStyle value="3"/>
-						<aconnectorLineJumps value="4"/>
-						<aconnectorLabelOrientation value="4"/>
-						<afromShapeXDiff value="0"/>
-						<afromShapeYDiff value="0"/>
-						<atoShapeXDiff value="0"/>
-						<atoShapeYDiff value="0"/>
-						<afromConnectType value="0"/>
-						<atoConnectType value="0"/>
-						<auseFromShapeCenter value="true"/>
-						<auseToShapeCenter value="true"/>
-						<afromPinType value="1"/>
-						<atoPinType value="1"/>
-						<arequestRebuild value="false"/>
-						<ashowConnectorName value="2"/>
-						<apaintThroughLabel value="2"/>
-					</properties>
-				</xmi:Extension>
-				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
-				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
-			</uml:DiagramElement>
-			<uml:DiagramElement geometry="614,17,159,71" preferredShapeType="NOTE" subject="afB2HuyCiu1SNxHe" xmi:id="kb6uHuyCiu1SNxJN">
-				<xmi:Extension extender="Visual Paradigm for UML">
-					<captionBounds value="0,0,159,0"/>
-					<captionInternalWidth value="-2147483648"/>
-					<captionInternalHeight value="-2147483648"/>
-					<captionVisible value="true"/>
-					<captionSide value="12"/>
-					<properties>
-						<abackground value="Cr:255,255,192,127"/>
-						<aforeground value="Cr:0,0,0,255"/>
-						<azOrder value="0"/>
-						<aselectable value="true"/>
-						<arequestResetCaption value="false"/>
-						<arequestResetCaptionSize value="false"/>
-						<adisplayStereotypeIcon value="false"/>
-						<aoverrideAppearanceWithStereotypeIcon value="true"/>
-						<arequestSetSizeOption value="0"/>
-						<aparentConnectorHeaderLength value="40"/>
-						<aparentConnectorLineLength value="10"/>
-						<aconnectToPoint value="true"/>
-						<aparentConnectorDTheta value="0.0"/>
-						<aconnectionPointType value="2"/>
-						<amodelElementNameAlignment value="9"/>
-						<arequestDefaultSize value="false"/>
-						<arequestFitSize value="false"/>
-						<arequestFitSizeFromCenter value="false"/>
-						<aangle value="0"/>
-					</properties>
-				</xmi:Extension>
-				<elementFill color1="Cr:255,255,192,127" color2="" style="1" transparency="50" type="1"/>
-				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
-				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
-			</uml:DiagramElement>
-			<uml:DiagramElement geometry="310,71,264,140" preferredShapeType="SECurveShape" subject="yr2uHuyCiu1SNxJW" xmi:id="yr2uHuyCiu1SNxJV">
-				<xmi:Extension extender="Visual Paradigm for UML">
-					<captionBounds value="0,0,40,40"/>
-					<captionInternalWidth value="-2147483648"/>
-					<captionInternalHeight value="-2147483648"/>
-					<captionVisible value="false"/>
-					<captionSide value="7"/>
-					<properties>
-						<abackground value="Cr:255,255,192,127"/>
-						<aforeground value="Cr:192,192,192,255"/>
-						<azOrder value="21"/>
-						<aselectable value="true"/>
-						<arequestResetCaption value="false"/>
-						<arequestResetCaptionSize value="false"/>
-						<adisplayStereotypeIcon value="false"/>
-						<aoverrideAppearanceWithStereotypeIcon value="true"/>
-						<arequestSetSizeOption value="0"/>
-						<aparentConnectorHeaderLength value="40"/>
-						<aparentConnectorLineLength value="10"/>
-						<aconnectToPoint value="true"/>
-						<aparentConnectorDTheta value="0.0"/>
-						<aconnectionPointType value="2"/>
-						<amodelElementNameAlignment value="9"/>
-						<arequestDefaultSize value="false"/>
-						<arequestFitSize value="false"/>
-						<arequestFitSizeFromCenter value="false"/>
-						<aobjectId value="1"/>
-						<aobjectType value="9096"/>
-						<anotUseVisibleBounds value="false"/>
-						<aalpha value="1.0"/>
-						<arotateAngle value="0.0"/>
-						<anodeName value="VPCurveShape"/>
-						<aactConnector value="true"/>
-						<adrawBy value="3"/>
-					</properties>
-					<FontFormat fontColor="Cr:0,0,0,255">
-						<Font name="Dialog" size="11" style="0"/>
-					</FontFormat>
-					<Label location="Pt:442.00000000000006,141.0" text=""/>
-					<Label transparency="0" tx="0.0" ty="0.0" type="0">
-						<FillFormat renderStyle="1">
-							<AffineTransformMatrix>
-								<Matrix value="1.0"/>
-								<Matrix value="0.0"/>
-								<Matrix value="0.0"/>
-								<Matrix value="1.0"/>
-								<Matrix value="0.0"/>
-								<Matrix value="-10.0"/>
-							</AffineTransformMatrix>
-							<Render color="Cr:0,0,0,255"/>
-						</FillFormat>
-					</Label>
-					<ShapeBasePoint point="Pt:442.00000000000006,141.0"/>
-					<Arrow endArrow="0" startArrow="0"/>
-					<LineFormat color="Cr:192,192,192,255" style="91" width="1.0">
-						<Stroke cap="0" dashPhase="0.0" join="0" miterlimit="10.0" type="0" width="1.0"/>
-					</LineFormat>
-					<FillFormat renderStyle="1">
-						<AffineTransformMatrix>
-							<Matrix value="1.0"/>
-							<Matrix value="0.0"/>
-							<Matrix value="0.0"/>
-							<Matrix value="1.0"/>
-							<Matrix value="0.0"/>
-							<Matrix value="-10.0"/>
-						</AffineTransformMatrix>
-						<Render color="Cr:255,255,192,127"/>
-					</FillFormat>
-					<CurveList windingRule="1">
-						<Curves>
-							<Curve controlPoint1="Pt:383.0,85.0" controlPoint2="Pt:501.0,85.0" endPoint="Pt:560.0,85.0" objectId="1" startPoint="Pt:324.0,85.0"/>
-							<Curve controlPoint1="Pt:560.0,113.0" controlPoint2="Pt:560.0,169.0" endPoint="Pt:560.0,197.0" objectId="2" startPoint="Pt:560.0,85.0"/>
-							<Curve controlPoint1="Pt:501.0,197.0" controlPoint2="Pt:383.0,197.0" endPoint="Pt:324.0,197.0" objectId="3" startPoint="Pt:560.0,197.0"/>
-							<Curve controlPoint1="Pt:324.0,169.0" controlPoint2="Pt:324.0,113.0" endPoint="Pt:324.0,85.0" objectId="4" startPoint="Pt:324.0,197.0"/>
-						</Curves>
-					</CurveList>
-				</xmi:Extension>
-				<elementFill color1="Cr:255,255,192,127" color2="" style="1" transparency="50" type="1"/>
-				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
-				<elementLine color="Cr:192,192,192,255" style="1" transparency="0" weight="1.0"/>
-			</uml:DiagramElement>
-			<uml:DiagramElement geometry="614,88;574,125;" preferredShapeType="Anchor" subject="qlVuHuyCiu1SNxJg" xmi:id="qlVuHuyCiu1SNxJh">
-				<xmi:Extension extender="Visual Paradigm for UML">
-					<captionBounds value="584,106,20,0"/>
-					<captionInternalWidth value="-2147483648"/>
-					<captionInternalHeight value="-2147483648"/>
-					<captionVisible value="true"/>
-					<captionSide value="1"/>
-					<properties>
-						<abackground value="Cr:122,207,245,255"/>
-						<aforeground value="Cr:0,0,0,255"/>
-						<azOrder value="-1"/>
-						<acreatorDiagramType value="ClassDiagram"/>
+			<uml:DiagramElement geometry="244,183;176,301;" preferredShapeType="AssociationClass" subject="P7f8nuyCiu1SNxQU" xmi:id="v7f8nuyCiu1SNxQV">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<captionBounds value="220,262,20,0"/>
+					<captionInternalWidth value="-2147483648"/>
+					<captionInternalHeight value="-2147483648"/>
+					<captionVisible value="true"/>
+					<captionSide value="1"/>
+					<properties>
+						<abackground value="Cr:122,207,245,255"/>
+						<aforeground value="Cr:0,0,0,255"/>
+						<azOrder value="-1"/>
 						<aselectable value="true"/>
 						<arequestResetCaption value="false"/>
 						<arequestResetCaptionSize value="false"/>
@@ -11381,7 +11824,7 @@
 			<properties>
 				<apmAuthor value="lavm"/>
 				<apmCreateDateTime value="1337357128123"/>
-				<apmLastModified value="1337636273600"/>
+				<apmLastModified value="1337876925227"/>
 				<ashowPackageNameStyle value="0"/>
 				<ashowConnectorName value="0"/>
 				<apaintConnectorThroughLabel value="0"/>
@@ -11499,7 +11942,7 @@
 				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
 				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
 			</uml:DiagramElement>
-			<uml:DiagramElement geometry="400,130,80,80" preferredShapeType="Class" subject="vTljmuyEwTiAAgLp" xmi:id="MS1NBuyCiu1SNweP">
+			<uml:DiagramElement geometry="400,130,80,70" preferredShapeType="Class" subject="vTljmuyEwTiAAgLp" xmi:id="MS1NBuyCiu1SNweP">
 				<xmi:Extension extender="Visual Paradigm for UML">
 					<captionBounds value="0,0,80,14"/>
 					<captionInternalWidth value="-2147483648"/>
@@ -11509,7 +11952,7 @@
 					<properties>
 						<abackground value="Cr:122,207,245,255"/>
 						<aforeground value="Cr:0,0,0,255"/>
-						<azOrder value="3"/>
+						<azOrder value="2"/>
 						<aselectable value="true"/>
 						<arequestResetCaption value="false"/>
 						<arequestResetCaptionSize value="false"/>
@@ -11819,9 +12262,9 @@
 				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
 				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
 			</uml:DiagramElement>
-			<uml:DiagramElement geometry="400,209;250,291;" preferredShapeType="Association" subject="Uf5tBuyCiu1SNwgY" xmi:id="0f5tBuyCiu1SNwgd">
-				<xmi:Extension extender="Visual Paradigm for UML">
-					<captionBounds value="320,260,121,14"/>
+			<uml:DiagramElement geometry="400,200;250,290;" preferredShapeType="Association" subject="Uf5tBuyCiu1SNwgY" xmi:id="0f5tBuyCiu1SNwgd">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<captionBounds value="320,252,121,14"/>
 					<captionInternalWidth value="-2147483648"/>
 					<captionInternalHeight value="-2147483648"/>
 					<captionVisible value="true"/>
@@ -11885,7 +12328,7 @@
 			</uml:DiagramElement>
 			<uml:DiagramElement geometry="210,129;210,90;120,90;120,150;169,150;" preferredShapeType="Association" subject="CNrtBuyCiu1SNwgz" xmi:id="CNrtBuyCiu1SNwg4">
 				<xmi:Extension extender="Visual Paradigm for UML">
-					<captionBounds value="115,58,108,14"/>
+					<captionBounds value="110,60,108,14"/>
 					<captionInternalWidth value="-2147483648"/>
 					<captionInternalHeight value="-2147483648"/>
 					<captionVisible value="true"/>
@@ -12011,389 +12454,9 @@
 				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
 				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
 			</uml:DiagramElement>
-		</uml:Diagram.element>
-	</uml:Diagram>
-	<uml:Diagram diagramType="ClassDiagram" documentation="" name="Component2" toolName="Visual Paradigm for UML" xmi:id="LDLNBuyCiu1SNwex">
-		<xmi:Extension extender="Visual Paradigm for UML">
-			<properties>
-				<apmAuthor value="lavm"/>
-				<apmCreateDateTime value="1337357192244"/>
-				<apmLastModified value="1337756037974"/>
-				<ashowPackageNameStyle value="0"/>
-				<ashowConnectorName value="0"/>
-				<apaintConnectorThroughLabel value="0"/>
-				<ashowActivityStateNodeCaption value="65535"/>
-				<aeditable value="true"/>
-				<afollowDiagramParentElement value="true"/>
-				<aautoFitShapesSize value="false"/>
-				<ashowTaggedValues value="false"/>
-				<ashowStereotypes value="true"/>
-				<ashowConstraints value="false"/>
-				<aalignToGrid value="false"/>
-				<agridVisible value="false"/>
-				<agridWidth value="10"/>
-				<agridHeight value="10"/>
-				<agridColor value="Cr:192,192,192,255"/>
-				<adiagramBackground value="Cr:255,255,255,255"/>
-				<aconnectorStyle value="1"/>
-				<aconnectorLineJumps value="0"/>
-				<aconnectorLineJumpsSize value="0"/>
-				<aconnectionPointStyle value="0"/>
-				<aconnectorLabelOrientation value="0"/>
-				<amodelElementNameAlignment value="4"/>
-				<azoomRatio value="1.0"/>
-				<amaximized value="false"/>
-				<ax value="0"/>
-				<ay value="0"/>
-				<awidth value="1235"/>
-				<aheight value="603"/>
-				<aqualityScore value="-1"/>
-				<aparentModel value="wzrNBuyCiu1SNwe3"/>
-				<a_globalPaletteOption value="true"/>
-				<a_alwaysShowReferenceAndSubdiagramResource value="false"/>
-				<ainitializeDiagramForCreate value="true"/>
-				<arequestValidateSnapToGrid value="false"/>
-				<ashowDefaultPackage value="true"/>
-				<adefaultPackage value="wzrNBuyCiu1SNwe3"/>
-				<ashowAttributeGetterSetter value="false"/>
-				<ashowClassOwner value="2"/>
-				<ashowPackageOwner value="2"/>
-				<ashowTemplateInfoOfGeneralizationAndRealization value="false"/>
-				<asuppressImplied1MultiplicityForAttributeAndAssociationEnd value="false"/>
-				<ashowClassEmptyCompartments value="2"/>
-				<ashowAttributesCodeDetails value="2"/>
-				<ashowAttributesType value="1"/>
-				<ashowOperationsParameters value="1"/>
-				<ashowOperationsReturnType value="1"/>
-				<ashowOperationsCodeDetails value="2"/>
-				<ashowParametersCodeDetails value="2"/>
-				<ashowEllipsisForUnshownClassMembers value="2"/>
-				<ageneralizationSetNotation value="2"/>
-			</properties>
-		</xmi:Extension>
-		<uml:Diagram.element>
-			<uml:DiagramElement geometry="370,140,80,50" preferredShapeType="Class" subject="2VbNBuyCiu1SNwe6" xmi:id="WVbNBuyCiu1SNwe5">
-				<xmi:Extension extender="Visual Paradigm for UML">
-					<captionBounds value="0,0,80,14"/>
-					<captionInternalWidth value="-2147483648"/>
-					<captionInternalHeight value="-2147483648"/>
-					<captionVisible value="true"/>
-					<captionSide value="12"/>
-					<properties>
-						<abackground value="Cr:122,207,245,255"/>
-						<aforeground value="Cr:0,0,0,255"/>
-						<azOrder value="14"/>
-						<acreatorDiagramType value="ClassDiagram"/>
-						<aselectable value="true"/>
-						<arequestResetCaption value="false"/>
-						<arequestResetCaptionSize value="false"/>
-						<adisplayStereotypeIcon value="false"/>
-						<aoverrideAppearanceWithStereotypeIcon value="true"/>
-						<arequestSetSizeOption value="0"/>
-						<aparentConnectorHeaderLength value="40"/>
-						<aparentConnectorLineLength value="10"/>
-						<aconnectToPoint value="true"/>
-						<aparentConnectorDTheta value="0.0"/>
-						<aconnectionPointType value="2"/>
-						<amodelElementNameAlignment value="9"/>
-						<arequestDefaultSize value="false"/>
-						<arequestFitSize value="false"/>
-						<arequestFitSizeFromCenter value="false"/>
-						<adisplayAsRobustnessAnalysisIcon value="true"/>
-						<avisibilityStyle value="1"/>
-						<ashowAttributeType value="1"/>
-						<ashowOperationType value="1"/>
-						<amSwTpPts value="true"/>
-						<alshRfAts value="true"/>
-						<amShDrAt value="false"/>
-						<akShDrOp value="false"/>
-						<akSwCsMbSt value="true"/>
-						<ashowClassMemberConstraints value="true"/>
-						<alShCmMl value="false"/>
-						<ashowOperationParameterDirection value="false"/>
-						<ashowOperationRaisedExceptions value="false"/>
-						<ashowParameterNameInOperationSignature value="true"/>
-						<ashowOperationTemplateParameters value="false"/>
-						<ashowOperationProperties value="false"/>
-						<awpMbs value="false"/>
-						<aattributeSortType value="0"/>
-						<aoperationSortType value="0"/>
-						<ashowInitialAttributeValue value="true"/>
-						<ashowOperationSignature value="true"/>
-						<ainterfaceBall value="false"/>
-						<ashowEmptyCompartments value="0"/>
-						<ashowEllipsisForUnshownMembers value="0"/>
-						<ashowAttributesCodeDetails value="0"/>
-						<ashowOperationsCodeDetails value="0"/>
-						<ashowParametersCodeDetails value="0"/>
-						<ashowTypeOption value="0"/>
-						<ashowOwnerOption value="3"/>
-						<ashowAttributesType value="0"/>
-						<ashowOperationsParameters value="0"/>
-						<ashowOperationsReturnType value="0"/>
-					</properties>
-				</xmi:Extension>
-				<elementFill color1="Cr:122,207,245,255" color2="" style="1" transparency="0" type="1"/>
-				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
-				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
-			</uml:DiagramElement>
-			<uml:DiagramElement geometry="140,140,80,80" preferredShapeType="Class" subject="vTljmuyEwTiAAgLp" xmi:id="ho2hzuyCiu1SNwwh">
-				<xmi:Extension extender="Visual Paradigm for UML">
-					<captionBounds value="0,0,80,14"/>
-					<captionInternalWidth value="-2147483648"/>
-					<captionInternalHeight value="-2147483648"/>
-					<captionVisible value="true"/>
-					<captionSide value="12"/>
-					<properties>
-						<abackground value="Cr:122,207,245,255"/>
-						<aforeground value="Cr:0,0,0,255"/>
-						<azOrder value="12"/>
-						<aselectable value="true"/>
-						<arequestResetCaption value="false"/>
-						<arequestResetCaptionSize value="false"/>
-						<adisplayStereotypeIcon value="false"/>
-						<aoverrideAppearanceWithStereotypeIcon value="true"/>
-						<arequestSetSizeOption value="0"/>
-						<aparentConnectorHeaderLength value="40"/>
-						<aparentConnectorLineLength value="10"/>
-						<aconnectToPoint value="true"/>
-						<aparentConnectorDTheta value="0.0"/>
-						<aconnectionPointType value="2"/>
-						<amodelElementNameAlignment value="9"/>
-						<arequestDefaultSize value="false"/>
-						<arequestFitSize value="false"/>
-						<arequestFitSizeFromCenter value="false"/>
-						<adisplayAsRobustnessAnalysisIcon value="true"/>
-						<avisibilityStyle value="1"/>
-						<ashowAttributeType value="1"/>
-						<ashowOperationType value="1"/>
-						<amSwTpPts value="true"/>
-						<alshRfAts value="true"/>
-						<amShDrAt value="false"/>
-						<akShDrOp value="false"/>
-						<akSwCsMbSt value="true"/>
-						<ashowClassMemberConstraints value="true"/>
-						<alShCmMl value="false"/>
-						<ashowOperationParameterDirection value="false"/>
-						<ashowOperationRaisedExceptions value="false"/>
-						<ashowParameterNameInOperationSignature value="true"/>
-						<ashowOperationTemplateParameters value="false"/>
-						<ashowOperationProperties value="false"/>
-						<awpMbs value="false"/>
-						<aattributeSortType value="0"/>
-						<aoperationSortType value="0"/>
-						<ashowInitialAttributeValue value="true"/>
-						<ashowOperationSignature value="true"/>
-						<ainterfaceBall value="false"/>
-						<ashowEmptyCompartments value="0"/>
-						<ashowEllipsisForUnshownMembers value="0"/>
-						<ashowAttributesCodeDetails value="0"/>
-						<ashowOperationsCodeDetails value="0"/>
-						<ashowParametersCodeDetails value="0"/>
-						<ashowTypeOption value="0"/>
-						<ashowOwnerOption value="3"/>
-						<ashowAttributesType value="0"/>
-						<ashowOperationsParameters value="0"/>
-						<ashowOperationsReturnType value="0"/>
-					</properties>
-				</xmi:Extension>
-				<elementFill color1="Cr:122,207,245,255" color2="" style="1" transparency="0" type="1"/>
-				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
-				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
-			</uml:DiagramElement>
-			<uml:DiagramElement geometry="220,170;369,170;" preferredShapeType="Association" subject="Uf5tBuyCiu1SNwgY" xmi:id="xo2hzuyCiu1SNwwj">
-				<xmi:Extension extender="Visual Paradigm for UML">
-					<captionBounds value="230,151,122,14"/>
-					<captionInternalWidth value="-2147483648"/>
-					<captionInternalHeight value="-2147483648"/>
-					<captionVisible value="true"/>
-					<captionSide value="1"/>
-					<properties>
-						<abackground value="Cr:122,207,245,255"/>
-						<aforeground value="Cr:0,0,0,255"/>
-						<azOrder value="-1"/>
-						<aselectable value="true"/>
-						<arequestResetCaption value="false"/>
-						<arequestResetCaptionSize value="false"/>
-						<aconnectorStyle value="3"/>
-						<aconnectorLineJumps value="4"/>
-						<aconnectorLabelOrientation value="4"/>
-						<afromShapeXDiff value="0"/>
-						<afromShapeYDiff value="0"/>
-						<atoShapeXDiff value="0"/>
-						<atoShapeYDiff value="0"/>
-						<afromConnectType value="0"/>
-						<atoConnectType value="0"/>
-						<auseFromShapeCenter value="true"/>
-						<auseToShapeCenter value="true"/>
-						<afromPinType value="1"/>
-						<atoPinType value="1"/>
-						<arequestRebuild value="false"/>
-						<ashowConnectorName value="2"/>
-						<apaintThroughLabel value="2"/>
-						<ahasRoleAShape value="false"/>
-						<ahasRoleBShape value="false"/>
-						<ashowMultiplicityConstraints value="false"/>
-						<ahasMultiplicityAShape value="false"/>
-						<ahasMultiplicityBShape value="false"/>
-						<a0SwDr value="false"/>
-						<ashowStereotypes value="true"/>
-						<ashowFromRoleName value="true"/>
-						<ashowToRoleName value="true"/>
-						<ashowFromMultiplicity value="true"/>
-						<ashowToMultiplicity value="true"/>
-						<ashowFromRoleVisibility value="true"/>
-						<ashowToRoleVisibility value="true"/>
-						<ashowAssociationEndPropertyStrings value="false"/>
-						<ahasAssociationEndPropertyStringsAShape value="false"/>
-						<ahasAssociationEndPropertyStringsBShape value="false"/>
-						<afromRoleInternalWidth value="-2147483648"/>
-						<afromRoleInternalHeight value="-2147483648"/>
-						<atoRoleInternalWidth value="-2147483648"/>
-						<atoRoleInternalHeight value="-2147483648"/>
-						<afromMultiplicityInternalWidth value="-2147483648"/>
-						<afromMultiplicityInternalHeight value="-2147483648"/>
-						<atoMultiplicityInternalWidth value="-2147483648"/>
-						<atoMultiplicityInternalHeight value="-2147483648"/>
-						<aassociationEndPropertyStringsAInternalWidth value="-2147483648"/>
-						<aassociationEndPropertyStringsAInternalHeight value="-2147483648"/>
-						<aassociationEndPropertyStringsBInternalWidth value="-2147483648"/>
-						<aassociationEndPropertyStringsBInternalHeight value="-2147483648"/>
-					</properties>
-				</xmi:Extension>
-				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
-				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
-			</uml:DiagramElement>
-			<uml:DiagramElement geometry="640,140,80,50" preferredShapeType="Class" subject="m6xjmuyEwTiAAgLk" xmi:id="XmhhzuyCiu1SNwwx">
-				<xmi:Extension extender="Visual Paradigm for UML">
-					<captionBounds value="0,0,80,14"/>
-					<captionInternalWidth value="-2147483648"/>
-					<captionInternalHeight value="-2147483648"/>
-					<captionVisible value="true"/>
-					<captionSide value="12"/>
-					<properties>
-						<abackground value="Cr:122,207,245,255"/>
-						<aforeground value="Cr:0,0,0,255"/>
-						<azOrder value="10"/>
-						<aselectable value="true"/>
-						<arequestResetCaption value="false"/>
-						<arequestResetCaptionSize value="false"/>
-						<adisplayStereotypeIcon value="false"/>
-						<aoverrideAppearanceWithStereotypeIcon value="true"/>
-						<arequestSetSizeOption value="0"/>
-						<aparentConnectorHeaderLength value="40"/>
-						<aparentConnectorLineLength value="10"/>
-						<aconnectToPoint value="true"/>
-						<aparentConnectorDTheta value="0.0"/>
-						<aconnectionPointType value="2"/>
-						<amodelElementNameAlignment value="9"/>
-						<arequestDefaultSize value="false"/>
-						<arequestFitSize value="false"/>
-						<arequestFitSizeFromCenter value="false"/>
-						<adisplayAsRobustnessAnalysisIcon value="true"/>
-						<avisibilityStyle value="1"/>
-						<ashowAttributeType value="1"/>
-						<ashowOperationType value="1"/>
-						<amSwTpPts value="true"/>
-						<alshRfAts value="true"/>
-						<amShDrAt value="false"/>
-						<akShDrOp value="false"/>
-						<akSwCsMbSt value="true"/>
-						<ashowClassMemberConstraints value="true"/>
-						<alShCmMl value="false"/>
-						<ashowOperationParameterDirection value="false"/>
-						<ashowOperationRaisedExceptions value="false"/>
-						<ashowParameterNameInOperationSignature value="true"/>
-						<ashowOperationTemplateParameters value="false"/>
-						<ashowOperationProperties value="false"/>
-						<awpMbs value="false"/>
-						<aattributeSortType value="0"/>
-						<aoperationSortType value="0"/>
-						<ashowInitialAttributeValue value="true"/>
-						<ashowOperationSignature value="true"/>
-						<ainterfaceBall value="false"/>
-						<ashowEmptyCompartments value="0"/>
-						<ashowEllipsisForUnshownMembers value="0"/>
-						<ashowAttributesCodeDetails value="0"/>
-						<ashowOperationsCodeDetails value="0"/>
-						<ashowParametersCodeDetails value="0"/>
-						<ashowTypeOption value="0"/>
-						<ashowOwnerOption value="3"/>
-						<ashowAttributesType value="0"/>
-						<ashowOperationsParameters value="0"/>
-						<ashowOperationsReturnType value="0"/>
-					</properties>
-				</xmi:Extension>
-				<elementFill color1="Cr:122,207,245,255" color2="" style="1" transparency="0" type="1"/>
-				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
-				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
-			</uml:DiagramElement>
-			<uml:DiagramElement geometry="639,160;450,160;" preferredShapeType="Association" subject="6.htBuyCiu1SNwgL" xmi:id="PmhhzuyCiu1SNww3">
-				<xmi:Extension extender="Visual Paradigm for UML">
-					<captionBounds value="488,143,108,14"/>
-					<captionInternalWidth value="-2147483648"/>
-					<captionInternalHeight value="-2147483648"/>
-					<captionVisible value="true"/>
-					<captionSide value="1"/>
-					<properties>
-						<abackground value="Cr:122,207,245,255"/>
-						<aforeground value="Cr:0,0,0,255"/>
-						<azOrder value="-1"/>
-						<aselectable value="true"/>
-						<arequestResetCaption value="false"/>
-						<arequestResetCaptionSize value="false"/>
-						<aconnectorStyle value="3"/>
-						<aconnectorLineJumps value="4"/>
-						<aconnectorLabelOrientation value="4"/>
-						<afromShapeXDiff value="0"/>
-						<afromShapeYDiff value="0"/>
-						<atoShapeXDiff value="0"/>
-						<atoShapeYDiff value="0"/>
-						<afromConnectType value="0"/>
-						<atoConnectType value="0"/>
-						<auseFromShapeCenter value="true"/>
-						<auseToShapeCenter value="true"/>
-						<afromPinType value="1"/>
-						<atoPinType value="1"/>
-						<arequestRebuild value="false"/>
-						<ashowConnectorName value="2"/>
-						<apaintThroughLabel value="2"/>
-						<ahasRoleAShape value="false"/>
-						<ahasRoleBShape value="false"/>
-						<ashowMultiplicityConstraints value="false"/>
-						<ahasMultiplicityAShape value="false"/>
-						<ahasMultiplicityBShape value="false"/>
-						<a0SwDr value="false"/>
-						<ashowStereotypes value="true"/>
-						<ashowFromRoleName value="true"/>
-						<ashowToRoleName value="true"/>
-						<ashowFromMultiplicity value="true"/>
-						<ashowToMultiplicity value="true"/>
-						<ashowFromRoleVisibility value="true"/>
-						<ashowToRoleVisibility value="true"/>
-						<ashowAssociationEndPropertyStrings value="false"/>
-						<ahasAssociationEndPropertyStringsAShape value="false"/>
-						<ahasAssociationEndPropertyStringsBShape value="false"/>
-						<afromRoleInternalWidth value="-2147483648"/>
-						<afromRoleInternalHeight value="-2147483648"/>
-						<atoRoleInternalWidth value="-2147483648"/>
-						<atoRoleInternalHeight value="-2147483648"/>
-						<afromMultiplicityInternalWidth value="-2147483648"/>
-						<afromMultiplicityInternalHeight value="-2147483648"/>
-						<atoMultiplicityInternalWidth value="-2147483648"/>
-						<atoMultiplicityInternalHeight value="-2147483648"/>
-						<aassociationEndPropertyStringsAInternalWidth value="-2147483648"/>
-						<aassociationEndPropertyStringsAInternalHeight value="-2147483648"/>
-						<aassociationEndPropertyStringsBInternalWidth value="-2147483648"/>
-						<aassociationEndPropertyStringsBInternalHeight value="-2147483648"/>
-					</properties>
-				</xmi:Extension>
-				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
-				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
-			</uml:DiagramElement>
-			<uml:DiagramElement geometry="420,190;420,230;490,230;490,180;450,180;" preferredShapeType="Association" subject="uYgRzuyCiu1SNwyI" xmi:id="eYgRzuyCiu1SNwyN">
-				<xmi:Extension extender="Visual Paradigm for UML">
-					<captionBounds value="320,210,110,14"/>
+			<uml:DiagramElement geometry="440,129;440,90;520,90;520,170;480,170;" preferredShapeType="Association" subject="1MC5_uyCiu1SNxbJ" xmi:id="1MC5_uyCiu1SNxbO">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<captionBounds value="430,60,102,14"/>
 					<captionInternalWidth value="-2147483648"/>
 					<captionInternalHeight value="-2147483648"/>
 					<captionVisible value="true"/>
@@ -12455,7 +12518,451 @@
 				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
 				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
 			</uml:DiagramElement>
-			<uml:DiagramElement geometry="200,310,130,50" preferredShapeType="Class" subject="WdORzuyCiu1SNwzI" xmi:id="WdORzuyCiu1SNwzH">
+		</uml:Diagram.element>
+	</uml:Diagram>
+	<uml:Diagram diagramType="ClassDiagram" documentation="" name="Component2" toolName="Visual Paradigm for UML" xmi:id="LDLNBuyCiu1SNwex">
+		<xmi:Extension extender="Visual Paradigm for UML">
+			<properties>
+				<apmAuthor value="lavm"/>
+				<apmCreateDateTime value="1337357192244"/>
+				<apmLastModified value="1337877230582"/>
+				<ashowPackageNameStyle value="0"/>
+				<ashowConnectorName value="0"/>
+				<apaintConnectorThroughLabel value="0"/>
+				<ashowActivityStateNodeCaption value="65535"/>
+				<aeditable value="true"/>
+				<afollowDiagramParentElement value="true"/>
+				<aautoFitShapesSize value="false"/>
+				<ashowTaggedValues value="false"/>
+				<ashowStereotypes value="true"/>
+				<ashowConstraints value="false"/>
+				<aalignToGrid value="false"/>
+				<agridVisible value="false"/>
+				<agridWidth value="10"/>
+				<agridHeight value="10"/>
+				<agridColor value="Cr:192,192,192,255"/>
+				<adiagramBackground value="Cr:255,255,255,255"/>
+				<aconnectorStyle value="1"/>
+				<aconnectorLineJumps value="0"/>
+				<aconnectorLineJumpsSize value="0"/>
+				<aconnectionPointStyle value="0"/>
+				<aconnectorLabelOrientation value="0"/>
+				<amodelElementNameAlignment value="4"/>
+				<azoomRatio value="1.0"/>
+				<amaximized value="false"/>
+				<ax value="0"/>
+				<ay value="0"/>
+				<awidth value="1235"/>
+				<aheight value="603"/>
+				<aqualityScore value="-1"/>
+				<aparentModel value="wzrNBuyCiu1SNwe3"/>
+				<a_globalPaletteOption value="true"/>
+				<a_alwaysShowReferenceAndSubdiagramResource value="false"/>
+				<ainitializeDiagramForCreate value="true"/>
+				<arequestValidateSnapToGrid value="false"/>
+				<ashowDefaultPackage value="true"/>
+				<adefaultPackage value="wzrNBuyCiu1SNwe3"/>
+				<ashowAttributeGetterSetter value="false"/>
+				<ashowClassOwner value="2"/>
+				<ashowPackageOwner value="2"/>
+				<ashowTemplateInfoOfGeneralizationAndRealization value="false"/>
+				<asuppressImplied1MultiplicityForAttributeAndAssociationEnd value="false"/>
+				<ashowClassEmptyCompartments value="2"/>
+				<ashowAttributesCodeDetails value="2"/>
+				<ashowAttributesType value="1"/>
+				<ashowOperationsParameters value="1"/>
+				<ashowOperationsReturnType value="1"/>
+				<ashowOperationsCodeDetails value="2"/>
+				<ashowParametersCodeDetails value="2"/>
+				<ashowEllipsisForUnshownClassMembers value="2"/>
+				<ageneralizationSetNotation value="2"/>
+			</properties>
+		</xmi:Extension>
+		<uml:Diagram.element>
+			<uml:DiagramElement geometry="370,68,80,50" preferredShapeType="Class" subject="2VbNBuyCiu1SNwe6" xmi:id="WVbNBuyCiu1SNwe5">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<captionBounds value="0,0,80,14"/>
+					<captionInternalWidth value="-2147483648"/>
+					<captionInternalHeight value="-2147483648"/>
+					<captionVisible value="true"/>
+					<captionSide value="12"/>
+					<properties>
+						<abackground value="Cr:122,207,245,255"/>
+						<aforeground value="Cr:0,0,0,255"/>
+						<azOrder value="20"/>
+						<acreatorDiagramType value="ClassDiagram"/>
+						<aselectable value="true"/>
+						<arequestResetCaption value="false"/>
+						<arequestResetCaptionSize value="false"/>
+						<adisplayStereotypeIcon value="false"/>
+						<aoverrideAppearanceWithStereotypeIcon value="true"/>
+						<arequestSetSizeOption value="0"/>
+						<aparentConnectorHeaderLength value="40"/>
+						<aparentConnectorLineLength value="10"/>
+						<aconnectToPoint value="true"/>
+						<aparentConnectorDTheta value="0.0"/>
+						<aconnectionPointType value="2"/>
+						<amodelElementNameAlignment value="9"/>
+						<arequestDefaultSize value="false"/>
+						<arequestFitSize value="false"/>
+						<arequestFitSizeFromCenter value="false"/>
+						<adisplayAsRobustnessAnalysisIcon value="true"/>
+						<avisibilityStyle value="1"/>
+						<ashowAttributeType value="1"/>
+						<ashowOperationType value="1"/>
+						<amSwTpPts value="true"/>
+						<alshRfAts value="true"/>
+						<amShDrAt value="false"/>
+						<akShDrOp value="false"/>
+						<akSwCsMbSt value="true"/>
+						<ashowClassMemberConstraints value="true"/>
+						<alShCmMl value="false"/>
+						<ashowOperationParameterDirection value="false"/>
+						<ashowOperationRaisedExceptions value="false"/>
+						<ashowParameterNameInOperationSignature value="true"/>
+						<ashowOperationTemplateParameters value="false"/>
+						<ashowOperationProperties value="false"/>
+						<awpMbs value="false"/>
+						<aattributeSortType value="0"/>
+						<aoperationSortType value="0"/>
+						<ashowInitialAttributeValue value="true"/>
+						<ashowOperationSignature value="true"/>
+						<ainterfaceBall value="false"/>
+						<ashowEmptyCompartments value="0"/>
+						<ashowEllipsisForUnshownMembers value="0"/>
+						<ashowAttributesCodeDetails value="0"/>
+						<ashowOperationsCodeDetails value="0"/>
+						<ashowParametersCodeDetails value="0"/>
+						<ashowTypeOption value="0"/>
+						<ashowOwnerOption value="3"/>
+						<ashowAttributesType value="0"/>
+						<ashowOperationsParameters value="0"/>
+						<ashowOperationsReturnType value="0"/>
+					</properties>
+				</xmi:Extension>
+				<elementFill color1="Cr:122,207,245,255" color2="" style="1" transparency="0" type="1"/>
+				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
+				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
+			</uml:DiagramElement>
+			<uml:DiagramElement geometry="140,68,80,78" preferredShapeType="Class" subject="vTljmuyEwTiAAgLp" xmi:id="ho2hzuyCiu1SNwwh">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<captionBounds value="0,0,80,14"/>
+					<captionInternalWidth value="-2147483648"/>
+					<captionInternalHeight value="-2147483648"/>
+					<captionVisible value="true"/>
+					<captionSide value="12"/>
+					<properties>
+						<abackground value="Cr:122,207,245,255"/>
+						<aforeground value="Cr:0,0,0,255"/>
+						<azOrder value="18"/>
+						<aselectable value="true"/>
+						<arequestResetCaption value="false"/>
+						<arequestResetCaptionSize value="false"/>
+						<adisplayStereotypeIcon value="false"/>
+						<aoverrideAppearanceWithStereotypeIcon value="true"/>
+						<arequestSetSizeOption value="0"/>
+						<aparentConnectorHeaderLength value="40"/>
+						<aparentConnectorLineLength value="10"/>
+						<aconnectToPoint value="true"/>
+						<aparentConnectorDTheta value="0.0"/>
+						<aconnectionPointType value="2"/>
+						<amodelElementNameAlignment value="9"/>
+						<arequestDefaultSize value="false"/>
+						<arequestFitSize value="false"/>
+						<arequestFitSizeFromCenter value="false"/>
+						<adisplayAsRobustnessAnalysisIcon value="true"/>
+						<avisibilityStyle value="1"/>
+						<ashowAttributeType value="1"/>
+						<ashowOperationType value="1"/>
+						<amSwTpPts value="true"/>
+						<alshRfAts value="true"/>
+						<amShDrAt value="false"/>
+						<akShDrOp value="false"/>
+						<akSwCsMbSt value="true"/>
+						<ashowClassMemberConstraints value="true"/>
+						<alShCmMl value="false"/>
+						<ashowOperationParameterDirection value="false"/>
+						<ashowOperationRaisedExceptions value="false"/>
+						<ashowParameterNameInOperationSignature value="true"/>
+						<ashowOperationTemplateParameters value="false"/>
+						<ashowOperationProperties value="false"/>
+						<awpMbs value="false"/>
+						<aattributeSortType value="0"/>
+						<aoperationSortType value="0"/>
+						<ashowInitialAttributeValue value="true"/>
+						<ashowOperationSignature value="true"/>
+						<ainterfaceBall value="false"/>
+						<ashowEmptyCompartments value="0"/>
+						<ashowEllipsisForUnshownMembers value="0"/>
+						<ashowAttributesCodeDetails value="0"/>
+						<ashowOperationsCodeDetails value="0"/>
+						<ashowParametersCodeDetails value="0"/>
+						<ashowTypeOption value="0"/>
+						<ashowOwnerOption value="3"/>
+						<ashowAttributesType value="0"/>
+						<ashowOperationsParameters value="0"/>
+						<ashowOperationsReturnType value="0"/>
+					</properties>
+				</xmi:Extension>
+				<elementFill color1="Cr:122,207,245,255" color2="" style="1" transparency="0" type="1"/>
+				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
+				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
+			</uml:DiagramElement>
+			<uml:DiagramElement geometry="220,98;369,98;" preferredShapeType="Association" subject="Uf5tBuyCiu1SNwgY" xmi:id="xo2hzuyCiu1SNwwj">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<captionBounds value="230,79,122,14"/>
+					<captionInternalWidth value="-2147483648"/>
+					<captionInternalHeight value="-2147483648"/>
+					<captionVisible value="true"/>
+					<captionSide value="1"/>
+					<properties>
+						<abackground value="Cr:122,207,245,255"/>
+						<aforeground value="Cr:0,0,0,255"/>
+						<azOrder value="-1"/>
+						<aselectable value="true"/>
+						<arequestResetCaption value="false"/>
+						<arequestResetCaptionSize value="false"/>
+						<aconnectorStyle value="3"/>
+						<aconnectorLineJumps value="4"/>
+						<aconnectorLabelOrientation value="4"/>
+						<afromShapeXDiff value="0"/>
+						<afromShapeYDiff value="0"/>
+						<atoShapeXDiff value="0"/>
+						<atoShapeYDiff value="0"/>
+						<afromConnectType value="0"/>
+						<atoConnectType value="0"/>
+						<auseFromShapeCenter value="true"/>
+						<auseToShapeCenter value="true"/>
+						<afromPinType value="1"/>
+						<atoPinType value="1"/>
+						<arequestRebuild value="false"/>
+						<ashowConnectorName value="2"/>
+						<apaintThroughLabel value="2"/>
+						<ahasRoleAShape value="false"/>
+						<ahasRoleBShape value="false"/>
+						<ashowMultiplicityConstraints value="false"/>
+						<ahasMultiplicityAShape value="false"/>
+						<ahasMultiplicityBShape value="false"/>
+						<a0SwDr value="false"/>
+						<ashowStereotypes value="true"/>
+						<ashowFromRoleName value="true"/>
+						<ashowToRoleName value="true"/>
+						<ashowFromMultiplicity value="true"/>
+						<ashowToMultiplicity value="true"/>
+						<ashowFromRoleVisibility value="true"/>
+						<ashowToRoleVisibility value="true"/>
+						<ashowAssociationEndPropertyStrings value="false"/>
+						<ahasAssociationEndPropertyStringsAShape value="false"/>
+						<ahasAssociationEndPropertyStringsBShape value="false"/>
+						<afromRoleInternalWidth value="-2147483648"/>
+						<afromRoleInternalHeight value="-2147483648"/>
+						<atoRoleInternalWidth value="-2147483648"/>
+						<atoRoleInternalHeight value="-2147483648"/>
+						<afromMultiplicityInternalWidth value="-2147483648"/>
+						<afromMultiplicityInternalHeight value="-2147483648"/>
+						<atoMultiplicityInternalWidth value="-2147483648"/>
+						<atoMultiplicityInternalHeight value="-2147483648"/>
+						<aassociationEndPropertyStringsAInternalWidth value="-2147483648"/>
+						<aassociationEndPropertyStringsAInternalHeight value="-2147483648"/>
+						<aassociationEndPropertyStringsBInternalWidth value="-2147483648"/>
+						<aassociationEndPropertyStringsBInternalHeight value="-2147483648"/>
+					</properties>
+				</xmi:Extension>
+				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
+				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
+			</uml:DiagramElement>
+			<uml:DiagramElement geometry="640,68,80,50" preferredShapeType="Class" subject="m6xjmuyEwTiAAgLk" xmi:id="XmhhzuyCiu1SNwwx">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<captionBounds value="0,0,80,14"/>
+					<captionInternalWidth value="-2147483648"/>
+					<captionInternalHeight value="-2147483648"/>
+					<captionVisible value="true"/>
+					<captionSide value="12"/>
+					<properties>
+						<abackground value="Cr:122,207,245,255"/>
+						<aforeground value="Cr:0,0,0,255"/>
+						<azOrder value="16"/>
+						<aselectable value="true"/>
+						<arequestResetCaption value="false"/>
+						<arequestResetCaptionSize value="false"/>
+						<adisplayStereotypeIcon value="false"/>
+						<aoverrideAppearanceWithStereotypeIcon value="true"/>
+						<arequestSetSizeOption value="0"/>
+						<aparentConnectorHeaderLength value="40"/>
+						<aparentConnectorLineLength value="10"/>
+						<aconnectToPoint value="true"/>
+						<aparentConnectorDTheta value="0.0"/>
+						<aconnectionPointType value="2"/>
+						<amodelElementNameAlignment value="9"/>
+						<arequestDefaultSize value="false"/>
+						<arequestFitSize value="false"/>
+						<arequestFitSizeFromCenter value="false"/>
+						<adisplayAsRobustnessAnalysisIcon value="true"/>
+						<avisibilityStyle value="1"/>
+						<ashowAttributeType value="1"/>
+						<ashowOperationType value="1"/>
+						<amSwTpPts value="true"/>
+						<alshRfAts value="true"/>
+						<amShDrAt value="false"/>
+						<akShDrOp value="false"/>
+						<akSwCsMbSt value="true"/>
+						<ashowClassMemberConstraints value="true"/>
+						<alShCmMl value="false"/>
+						<ashowOperationParameterDirection value="false"/>
+						<ashowOperationRaisedExceptions value="false"/>
+						<ashowParameterNameInOperationSignature value="true"/>
+						<ashowOperationTemplateParameters value="false"/>
+						<ashowOperationProperties value="false"/>
+						<awpMbs value="false"/>
+						<aattributeSortType value="0"/>
+						<aoperationSortType value="0"/>
+						<ashowInitialAttributeValue value="true"/>
+						<ashowOperationSignature value="true"/>
+						<ainterfaceBall value="false"/>
+						<ashowEmptyCompartments value="0"/>
+						<ashowEllipsisForUnshownMembers value="0"/>
+						<ashowAttributesCodeDetails value="0"/>
+						<ashowOperationsCodeDetails value="0"/>
+						<ashowParametersCodeDetails value="0"/>
+						<ashowTypeOption value="0"/>
+						<ashowOwnerOption value="3"/>
+						<ashowAttributesType value="0"/>
+						<ashowOperationsParameters value="0"/>
+						<ashowOperationsReturnType value="0"/>
+					</properties>
+				</xmi:Extension>
+				<elementFill color1="Cr:122,207,245,255" color2="" style="1" transparency="0" type="1"/>
+				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
+				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
+			</uml:DiagramElement>
+			<uml:DiagramElement geometry="639,88;450,88;" preferredShapeType="Association" subject="6.htBuyCiu1SNwgL" xmi:id="PmhhzuyCiu1SNww3">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<captionBounds value="488,71,108,14"/>
+					<captionInternalWidth value="-2147483648"/>
+					<captionInternalHeight value="-2147483648"/>
+					<captionVisible value="true"/>
+					<captionSide value="1"/>
+					<properties>
+						<abackground value="Cr:122,207,245,255"/>
+						<aforeground value="Cr:0,0,0,255"/>
+						<azOrder value="-1"/>
+						<aselectable value="true"/>
+						<arequestResetCaption value="false"/>
+						<arequestResetCaptionSize value="false"/>
+						<aconnectorStyle value="3"/>
+						<aconnectorLineJumps value="4"/>
+						<aconnectorLabelOrientation value="4"/>
+						<afromShapeXDiff value="0"/>
+						<afromShapeYDiff value="0"/>
+						<atoShapeXDiff value="0"/>
+						<atoShapeYDiff value="0"/>
+						<afromConnectType value="0"/>
+						<atoConnectType value="0"/>
+						<auseFromShapeCenter value="true"/>
+						<auseToShapeCenter value="true"/>
+						<afromPinType value="1"/>
+						<atoPinType value="1"/>
+						<arequestRebuild value="false"/>
+						<ashowConnectorName value="2"/>
+						<apaintThroughLabel value="2"/>
+						<ahasRoleAShape value="false"/>
+						<ahasRoleBShape value="false"/>
+						<ashowMultiplicityConstraints value="false"/>
+						<ahasMultiplicityAShape value="false"/>
+						<ahasMultiplicityBShape value="false"/>
+						<a0SwDr value="false"/>
+						<ashowStereotypes value="true"/>
+						<ashowFromRoleName value="true"/>
+						<ashowToRoleName value="true"/>
+						<ashowFromMultiplicity value="true"/>
+						<ashowToMultiplicity value="true"/>
+						<ashowFromRoleVisibility value="true"/>
+						<ashowToRoleVisibility value="true"/>
+						<ashowAssociationEndPropertyStrings value="false"/>
+						<ahasAssociationEndPropertyStringsAShape value="false"/>
+						<ahasAssociationEndPropertyStringsBShape value="false"/>
+						<afromRoleInternalWidth value="-2147483648"/>
+						<afromRoleInternalHeight value="-2147483648"/>
+						<atoRoleInternalWidth value="-2147483648"/>
+						<atoRoleInternalHeight value="-2147483648"/>
+						<afromMultiplicityInternalWidth value="-2147483648"/>
+						<afromMultiplicityInternalHeight value="-2147483648"/>
+						<atoMultiplicityInternalWidth value="-2147483648"/>
+						<atoMultiplicityInternalHeight value="-2147483648"/>
+						<aassociationEndPropertyStringsAInternalWidth value="-2147483648"/>
+						<aassociationEndPropertyStringsAInternalHeight value="-2147483648"/>
+						<aassociationEndPropertyStringsBInternalWidth value="-2147483648"/>
+						<aassociationEndPropertyStringsBInternalHeight value="-2147483648"/>
+					</properties>
+				</xmi:Extension>
+				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
+				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
+			</uml:DiagramElement>
+			<uml:DiagramElement geometry="420,118;420,158;490,158;490,108;450,108;" preferredShapeType="Association" subject="uYgRzuyCiu1SNwyI" xmi:id="eYgRzuyCiu1SNwyN">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<captionBounds value="457,160,110,14"/>
+					<captionInternalWidth value="-2147483648"/>
+					<captionInternalHeight value="-2147483648"/>
+					<captionVisible value="true"/>
+					<captionSide value="1"/>
+					<properties>
+						<abackground value="Cr:122,207,245,255"/>
+						<aforeground value="Cr:0,0,0,255"/>
+						<azOrder value="-1"/>
+						<acreatorDiagramType value="ClassDiagram"/>
+						<aselectable value="true"/>
+						<arequestResetCaption value="false"/>
+						<arequestResetCaptionSize value="false"/>
+						<aconnectorStyle value="3"/>
+						<aconnectorLineJumps value="4"/>
+						<aconnectorLabelOrientation value="4"/>
+						<afromShapeXDiff value="0"/>
+						<afromShapeYDiff value="0"/>
+						<atoShapeXDiff value="0"/>
+						<atoShapeYDiff value="0"/>
+						<afromConnectType value="0"/>
+						<atoConnectType value="0"/>
+						<auseFromShapeCenter value="true"/>
+						<auseToShapeCenter value="true"/>
+						<afromPinType value="1"/>
+						<atoPinType value="1"/>
+						<arequestRebuild value="false"/>
+						<ashowConnectorName value="2"/>
+						<apaintThroughLabel value="2"/>
+						<ahasRoleAShape value="false"/>
+						<ahasRoleBShape value="false"/>
+						<ashowMultiplicityConstraints value="false"/>
+						<ahasMultiplicityAShape value="false"/>
+						<ahasMultiplicityBShape value="false"/>
+						<a0SwDr value="false"/>
+						<ashowStereotypes value="true"/>
+						<ashowFromRoleName value="true"/>
+						<ashowToRoleName value="true"/>
+						<ashowFromMultiplicity value="true"/>
+						<ashowToMultiplicity value="true"/>
+						<ashowFromRoleVisibility value="true"/>
+						<ashowToRoleVisibility value="true"/>
+						<ashowAssociationEndPropertyStrings value="false"/>
+						<ahasAssociationEndPropertyStringsAShape value="false"/>
+						<ahasAssociationEndPropertyStringsBShape value="false"/>
+						<afromRoleInternalWidth value="-2147483648"/>
+						<afromRoleInternalHeight value="-2147483648"/>
+						<atoRoleInternalWidth value="-2147483648"/>
+						<atoRoleInternalHeight value="-2147483648"/>
+						<afromMultiplicityInternalWidth value="-2147483648"/>
+						<afromMultiplicityInternalHeight value="-2147483648"/>
+						<atoMultiplicityInternalWidth value="-2147483648"/>
+						<atoMultiplicityInternalHeight value="-2147483648"/>
+						<aassociationEndPropertyStringsAInternalWidth value="-2147483648"/>
+						<aassociationEndPropertyStringsAInternalHeight value="-2147483648"/>
+						<aassociationEndPropertyStringsBInternalWidth value="-2147483648"/>
+						<aassociationEndPropertyStringsBInternalHeight value="-2147483648"/>
+					</properties>
+				</xmi:Extension>
+				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
+				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
+			</uml:DiagramElement>
+			<uml:DiagramElement geometry="155,272,130,50" preferredShapeType="Class" subject="WdORzuyCiu1SNwzI" xmi:id="WdORzuyCiu1SNwzH">
 				<xmi:Extension extender="Visual Paradigm for UML">
 					<captionBounds value="0,0,130,14"/>
 					<captionInternalWidth value="-2147483648"/>
@@ -12465,6 +12972,435 @@
 					<properties>
 						<abackground value="Cr:192,192,192,255"/>
 						<aforeground value="Cr:0,0,0,255"/>
+						<azOrder value="14"/>
+						<acreatorDiagramType value="ClassDiagram"/>
+						<aselectable value="true"/>
+						<arequestResetCaption value="false"/>
+						<arequestResetCaptionSize value="false"/>
+						<adisplayStereotypeIcon value="false"/>
+						<aoverrideAppearanceWithStereotypeIcon value="true"/>
+						<arequestSetSizeOption value="0"/>
+						<aparentConnectorHeaderLength value="40"/>
+						<aparentConnectorLineLength value="10"/>
+						<aconnectToPoint value="true"/>
+						<aparentConnectorDTheta value="0.0"/>
+						<aconnectionPointType value="2"/>
+						<amodelElementNameAlignment value="9"/>
+						<arequestDefaultSize value="false"/>
+						<arequestFitSize value="false"/>
+						<arequestFitSizeFromCenter value="false"/>
+						<adisplayAsRobustnessAnalysisIcon value="true"/>
+						<avisibilityStyle value="1"/>
+						<ashowAttributeType value="1"/>
+						<ashowOperationType value="1"/>
+						<amSwTpPts value="true"/>
+						<alshRfAts value="true"/>
+						<amShDrAt value="false"/>
+						<akShDrOp value="false"/>
+						<akSwCsMbSt value="true"/>
+						<ashowClassMemberConstraints value="true"/>
+						<alShCmMl value="false"/>
+						<ashowOperationParameterDirection value="false"/>
+						<ashowOperationRaisedExceptions value="false"/>
+						<ashowParameterNameInOperationSignature value="true"/>
+						<ashowOperationTemplateParameters value="false"/>
+						<ashowOperationProperties value="false"/>
+						<awpMbs value="false"/>
+						<aattributeSortType value="0"/>
+						<aoperationSortType value="0"/>
+						<ashowInitialAttributeValue value="true"/>
+						<ashowOperationSignature value="true"/>
+						<ainterfaceBall value="false"/>
+						<ashowEmptyCompartments value="0"/>
+						<ashowEllipsisForUnshownMembers value="0"/>
+						<ashowAttributesCodeDetails value="0"/>
+						<ashowOperationsCodeDetails value="0"/>
+						<ashowParametersCodeDetails value="0"/>
+						<ashowTypeOption value="0"/>
+						<ashowOwnerOption value="3"/>
+						<ashowAttributesType value="0"/>
+						<ashowOperationsParameters value="0"/>
+						<ashowOperationsReturnType value="0"/>
+					</properties>
+				</xmi:Extension>
+				<elementFill color1="Cr:192,192,192,255" color2="" style="1" transparency="0" type="1"/>
+				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
+				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
+			</uml:DiagramElement>
+			<uml:DiagramElement geometry="263,98;263,271;" preferredShapeType="AssociationClass" subject="N.hRzuyCiu1SNwzM" xmi:id="N.hRzuyCiu1SNwzN">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<captionBounds value="273,208,20,0"/>
+					<captionInternalWidth value="-2147483648"/>
+					<captionInternalHeight value="-2147483648"/>
+					<captionVisible value="true"/>
+					<captionSide value="1"/>
+					<properties>
+						<abackground value="Cr:122,207,245,255"/>
+						<aforeground value="Cr:0,0,0,255"/>
+						<azOrder value="-1"/>
+						<aselectable value="true"/>
+						<arequestResetCaption value="false"/>
+						<arequestResetCaptionSize value="false"/>
+						<aconnectorStyle value="3"/>
+						<aconnectorLineJumps value="4"/>
+						<aconnectorLabelOrientation value="4"/>
+						<afromShapeXDiff value="0"/>
+						<afromShapeYDiff value="0"/>
+						<atoShapeXDiff value="0"/>
+						<atoShapeYDiff value="0"/>
+						<afromConnectType value="0"/>
+						<atoConnectType value="0"/>
+						<auseFromShapeCenter value="true"/>
+						<auseToShapeCenter value="true"/>
+						<afromPinType value="1"/>
+						<atoPinType value="1"/>
+						<arequestRebuild value="false"/>
+						<ashowConnectorName value="2"/>
+						<apaintThroughLabel value="2"/>
+					</properties>
+				</xmi:Extension>
+				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
+				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
+			</uml:DiagramElement>
+			<uml:DiagramElement geometry="636,275,105,40" preferredShapeType="Class" subject="CIdRzuyCiu1SNwzZ" xmi:id="8IdRzuyCiu1SNwzY">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<captionBounds value="0,0,105,28"/>
+					<captionInternalWidth value="-2147483648"/>
+					<captionInternalHeight value="-2147483648"/>
+					<captionVisible value="true"/>
+					<captionSide value="12"/>
+					<properties>
+						<abackground value="Cr:179,214,249,255"/>
+						<aforeground value="Cr:0,0,0,255"/>
+						<azOrder value="12"/>
+						<acreatorDiagramType value="ClassDiagram"/>
+						<aselectable value="true"/>
+						<arequestResetCaption value="false"/>
+						<arequestResetCaptionSize value="false"/>
+						<adisplayStereotypeIcon value="false"/>
+						<aoverrideAppearanceWithStereotypeIcon value="true"/>
+						<arequestSetSizeOption value="0"/>
+						<aparentConnectorHeaderLength value="40"/>
+						<aparentConnectorLineLength value="10"/>
+						<aconnectToPoint value="true"/>
+						<aparentConnectorDTheta value="0.0"/>
+						<aconnectionPointType value="2"/>
+						<amodelElementNameAlignment value="9"/>
+						<arequestDefaultSize value="false"/>
+						<arequestFitSize value="false"/>
+						<arequestFitSizeFromCenter value="false"/>
+						<adisplayAsRobustnessAnalysisIcon value="true"/>
+						<avisibilityStyle value="1"/>
+						<ashowAttributeType value="1"/>
+						<ashowOperationType value="1"/>
+						<amSwTpPts value="true"/>
+						<alshRfAts value="true"/>
+						<amShDrAt value="false"/>
+						<akShDrOp value="false"/>
+						<akSwCsMbSt value="true"/>
+						<ashowClassMemberConstraints value="true"/>
+						<alShCmMl value="false"/>
+						<ashowOperationParameterDirection value="false"/>
+						<ashowOperationRaisedExceptions value="false"/>
+						<ashowParameterNameInOperationSignature value="true"/>
+						<ashowOperationTemplateParameters value="false"/>
+						<ashowOperationProperties value="false"/>
+						<awpMbs value="false"/>
+						<aattributeSortType value="0"/>
+						<aoperationSortType value="0"/>
+						<ashowInitialAttributeValue value="true"/>
+						<ashowOperationSignature value="true"/>
+						<ainterfaceBall value="false"/>
+						<ashowEmptyCompartments value="0"/>
+						<ashowEllipsisForUnshownMembers value="0"/>
+						<ashowAttributesCodeDetails value="0"/>
+						<ashowOperationsCodeDetails value="0"/>
+						<ashowParametersCodeDetails value="0"/>
+						<ashowTypeOption value="0"/>
+						<ashowOwnerOption value="3"/>
+						<ashowAttributesType value="0"/>
+						<ashowOperationsParameters value="0"/>
+						<ashowOperationsReturnType value="0"/>
+					</properties>
+				</xmi:Extension>
+				<elementFill color1="Cr:179,214,249,255" color2="" style="1" transparency="0" type="1"/>
+				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
+				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
+			</uml:DiagramElement>
+			<uml:DiagramElement geometry="680,118;680,274;" preferredShapeType="Generalization" subject="cELRzuyCiu1SNwzd" xmi:id="cELRzuyCiu1SNwze">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<captionBounds value="680,195,20,0"/>
+					<captionInternalWidth value="-2147483648"/>
+					<captionInternalHeight value="-2147483648"/>
+					<captionVisible value="true"/>
+					<captionSide value="1"/>
+					<properties>
+						<abackground value="Cr:255,255,255,255"/>
+						<aforeground value="Cr:0,0,0,255"/>
+						<azOrder value="-1"/>
+						<acreatorDiagramType value="ClassDiagram"/>
+						<aselectable value="true"/>
+						<arequestResetCaption value="false"/>
+						<arequestResetCaptionSize value="false"/>
+						<aconnectorStyle value="3"/>
+						<aconnectorLineJumps value="4"/>
+						<aconnectorLabelOrientation value="4"/>
+						<afromShapeXDiff value="0"/>
+						<afromShapeYDiff value="0"/>
+						<atoShapeXDiff value="0"/>
+						<atoShapeYDiff value="0"/>
+						<afromConnectType value="0"/>
+						<atoConnectType value="0"/>
+						<auseFromShapeCenter value="true"/>
+						<auseToShapeCenter value="true"/>
+						<afromPinType value="1"/>
+						<atoPinType value="1"/>
+						<arequestRebuild value="false"/>
+						<ashowConnectorName value="2"/>
+						<apaintThroughLabel value="2"/>
+					</properties>
+				</xmi:Extension>
+				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
+				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
+			</uml:DiagramElement>
+			<uml:DiagramElement geometry="285,295;635,295;" preferredShapeType="Association" subject="tG7RzuyCiu1SNwzq" xmi:id="9G7RzuyCiu1SNwzv">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<captionBounds value="434,298,44,14"/>
+					<captionInternalWidth value="-2147483648"/>
+					<captionInternalHeight value="-2147483648"/>
+					<captionVisible value="true"/>
+					<captionSide value="1"/>
+					<properties>
+						<abackground value="Cr:122,207,245,255"/>
+						<aforeground value="Cr:0,0,0,255"/>
+						<azOrder value="-1"/>
+						<acreatorDiagramType value="ClassDiagram"/>
+						<aselectable value="true"/>
+						<arequestResetCaption value="false"/>
+						<arequestResetCaptionSize value="false"/>
+						<aconnectorStyle value="3"/>
+						<aconnectorLineJumps value="4"/>
+						<aconnectorLabelOrientation value="4"/>
+						<afromShapeXDiff value="0"/>
+						<afromShapeYDiff value="0"/>
+						<atoShapeXDiff value="0"/>
+						<atoShapeYDiff value="0"/>
+						<afromConnectType value="0"/>
+						<atoConnectType value="0"/>
+						<auseFromShapeCenter value="true"/>
+						<auseToShapeCenter value="true"/>
+						<afromPinType value="1"/>
+						<atoPinType value="1"/>
+						<arequestRebuild value="false"/>
+						<ashowConnectorName value="2"/>
+						<apaintThroughLabel value="2"/>
+						<ahasRoleAShape value="false"/>
+						<ahasRoleBShape value="false"/>
+						<ashowMultiplicityConstraints value="false"/>
+						<ahasMultiplicityAShape value="false"/>
+						<ahasMultiplicityBShape value="false"/>
+						<a0SwDr value="false"/>
+						<ashowStereotypes value="true"/>
+						<ashowFromRoleName value="true"/>
+						<ashowToRoleName value="true"/>
+						<ashowFromMultiplicity value="true"/>
+						<ashowToMultiplicity value="true"/>
+						<ashowFromRoleVisibility value="true"/>
+						<ashowToRoleVisibility value="true"/>
+						<ashowAssociationEndPropertyStrings value="false"/>
+						<ahasAssociationEndPropertyStringsAShape value="false"/>
+						<ahasAssociationEndPropertyStringsBShape value="false"/>
+						<afromRoleInternalWidth value="-2147483648"/>
+						<afromRoleInternalHeight value="-2147483648"/>
+						<atoRoleInternalWidth value="-2147483648"/>
+						<atoRoleInternalHeight value="-2147483648"/>
+						<afromMultiplicityInternalWidth value="-2147483648"/>
+						<afromMultiplicityInternalHeight value="-2147483648"/>
+						<atoMultiplicityInternalWidth value="-2147483648"/>
+						<atoMultiplicityInternalHeight value="-2147483648"/>
+						<aassociationEndPropertyStringsAInternalWidth value="-2147483648"/>
+						<aassociationEndPropertyStringsAInternalHeight value="-2147483648"/>
+						<aassociationEndPropertyStringsBInternalWidth value="-2147483648"/>
+						<aassociationEndPropertyStringsBInternalHeight value="-2147483648"/>
+					</properties>
+				</xmi:Extension>
+				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
+				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
+			</uml:DiagramElement>
+			<uml:DiagramElement geometry="412,198,120,50" preferredShapeType="Class" subject="qmwxzuyCiu1SNwz5" xmi:id="qmwxzuyCiu1SNwz4">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<captionBounds value="0,0,120,14"/>
+					<captionInternalWidth value="-2147483648"/>
+					<captionInternalHeight value="-2147483648"/>
+					<captionVisible value="true"/>
+					<captionSide value="12"/>
+					<properties>
+						<abackground value="Cr:192,192,192,255"/>
+						<aforeground value="Cr:0,0,0,255"/>
+						<azOrder value="10"/>
+						<acreatorDiagramType value="ClassDiagram"/>
+						<aselectable value="true"/>
+						<arequestResetCaption value="false"/>
+						<arequestResetCaptionSize value="false"/>
+						<adisplayStereotypeIcon value="false"/>
+						<aoverrideAppearanceWithStereotypeIcon value="true"/>
+						<arequestSetSizeOption value="0"/>
+						<aparentConnectorHeaderLength value="40"/>
+						<aparentConnectorLineLength value="10"/>
+						<aconnectToPoint value="true"/>
+						<aparentConnectorDTheta value="0.0"/>
+						<aconnectionPointType value="2"/>
+						<amodelElementNameAlignment value="9"/>
+						<arequestDefaultSize value="false"/>
+						<arequestFitSize value="false"/>
+						<arequestFitSizeFromCenter value="false"/>
+						<adisplayAsRobustnessAnalysisIcon value="true"/>
+						<avisibilityStyle value="1"/>
+						<ashowAttributeType value="1"/>
+						<ashowOperationType value="1"/>
+						<amSwTpPts value="true"/>
+						<alshRfAts value="true"/>
+						<amShDrAt value="false"/>
+						<akShDrOp value="false"/>
+						<akSwCsMbSt value="true"/>
+						<ashowClassMemberConstraints value="true"/>
+						<alShCmMl value="false"/>
+						<ashowOperationParameterDirection value="false"/>
+						<ashowOperationRaisedExceptions value="false"/>
+						<ashowParameterNameInOperationSignature value="true"/>
+						<ashowOperationTemplateParameters value="false"/>
+						<ashowOperationProperties value="false"/>
+						<awpMbs value="false"/>
+						<aattributeSortType value="0"/>
+						<aoperationSortType value="0"/>
+						<ashowInitialAttributeValue value="true"/>
+						<ashowOperationSignature value="true"/>
+						<ainterfaceBall value="false"/>
+						<ashowEmptyCompartments value="0"/>
+						<ashowEllipsisForUnshownMembers value="0"/>
+						<ashowAttributesCodeDetails value="0"/>
+						<ashowOperationsCodeDetails value="0"/>
+						<ashowParametersCodeDetails value="0"/>
+						<ashowTypeOption value="0"/>
+						<ashowOwnerOption value="3"/>
+						<ashowAttributesType value="0"/>
+						<ashowOperationsParameters value="0"/>
+						<ashowOperationsReturnType value="0"/>
+					</properties>
+				</xmi:Extension>
+				<elementFill color1="Cr:192,192,192,255" color2="" style="1" transparency="0" type="1"/>
+				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
+				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
+			</uml:DiagramElement>
+			<uml:DiagramElement geometry="451,158;451,197;" preferredShapeType="AssociationClass" subject="1DMxzuyCiu1SNw0F" xmi:id="1DMxzuyCiu1SNw0G">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<captionBounds value="461,197,20,0"/>
+					<captionInternalWidth value="-2147483648"/>
+					<captionInternalHeight value="-2147483648"/>
+					<captionVisible value="true"/>
+					<captionSide value="1"/>
+					<properties>
+						<abackground value="Cr:122,207,245,255"/>
+						<aforeground value="Cr:0,0,0,255"/>
+						<azOrder value="-1"/>
+						<aselectable value="true"/>
+						<arequestResetCaption value="false"/>
+						<arequestResetCaptionSize value="false"/>
+						<aconnectorStyle value="3"/>
+						<aconnectorLineJumps value="4"/>
+						<aconnectorLabelOrientation value="4"/>
+						<afromShapeXDiff value="0"/>
+						<afromShapeYDiff value="0"/>
+						<atoShapeXDiff value="0"/>
+						<atoShapeYDiff value="0"/>
+						<afromConnectType value="0"/>
+						<atoConnectType value="0"/>
+						<auseFromShapeCenter value="true"/>
+						<auseToShapeCenter value="true"/>
+						<afromPinType value="1"/>
+						<atoPinType value="1"/>
+						<arequestRebuild value="false"/>
+						<ashowConnectorName value="2"/>
+						<apaintThroughLabel value="2"/>
+					</properties>
+				</xmi:Extension>
+				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
+				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
+			</uml:DiagramElement>
+			<uml:DiagramElement geometry="411,206;179,206;179,146;" preferredShapeType="Association" subject="iyCxzuyCiu1SNw0N" xmi:id="iyCxzuyCiu1SNw0S">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<captionBounds value="207,207,58,14"/>
+					<captionInternalWidth value="-2147483648"/>
+					<captionInternalHeight value="-2147483648"/>
+					<captionVisible value="true"/>
+					<captionSide value="1"/>
+					<properties>
+						<abackground value="Cr:122,207,245,255"/>
+						<aforeground value="Cr:0,0,0,255"/>
+						<azOrder value="-1"/>
+						<acreatorDiagramType value="ClassDiagram"/>
+						<aselectable value="true"/>
+						<arequestResetCaption value="false"/>
+						<arequestResetCaptionSize value="false"/>
+						<aconnectorStyle value="3"/>
+						<aconnectorLineJumps value="4"/>
+						<aconnectorLabelOrientation value="4"/>
+						<afromShapeXDiff value="0"/>
+						<afromShapeYDiff value="0"/>
+						<atoShapeXDiff value="0"/>
+						<atoShapeYDiff value="0"/>
+						<afromConnectType value="0"/>
+						<atoConnectType value="0"/>
+						<auseFromShapeCenter value="true"/>
+						<auseToShapeCenter value="true"/>
+						<afromPinType value="1"/>
+						<atoPinType value="1"/>
+						<arequestRebuild value="false"/>
+						<ashowConnectorName value="2"/>
+						<apaintThroughLabel value="2"/>
+						<ahasRoleAShape value="false"/>
+						<ahasRoleBShape value="false"/>
+						<ashowMultiplicityConstraints value="false"/>
+						<ahasMultiplicityAShape value="false"/>
+						<ahasMultiplicityBShape value="false"/>
+						<a0SwDr value="false"/>
+						<ashowStereotypes value="true"/>
+						<ashowFromRoleName value="true"/>
+						<ashowToRoleName value="true"/>
+						<ashowFromMultiplicity value="true"/>
+						<ashowToMultiplicity value="true"/>
+						<ashowFromRoleVisibility value="true"/>
+						<ashowToRoleVisibility value="true"/>
+						<ashowAssociationEndPropertyStrings value="false"/>
+						<ahasAssociationEndPropertyStringsAShape value="false"/>
+						<ahasAssociationEndPropertyStringsBShape value="false"/>
+						<afromRoleInternalWidth value="-2147483648"/>
+						<afromRoleInternalHeight value="-2147483648"/>
+						<atoRoleInternalWidth value="-2147483648"/>
+						<atoRoleInternalHeight value="-2147483648"/>
+						<afromMultiplicityInternalWidth value="-2147483648"/>
+						<afromMultiplicityInternalHeight value="-2147483648"/>
+						<atoMultiplicityInternalWidth value="-2147483648"/>
+						<atoMultiplicityInternalHeight value="-2147483648"/>
+						<aassociationEndPropertyStringsAInternalWidth value="-2147483648"/>
+						<aassociationEndPropertyStringsAInternalHeight value="-2147483648"/>
+						<aassociationEndPropertyStringsBInternalWidth value="-2147483648"/>
+						<aassociationEndPropertyStringsBInternalHeight value="-2147483648"/>
+					</properties>
+				</xmi:Extension>
+				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
+				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
+			</uml:DiagramElement>
+			<uml:DiagramElement geometry="552,198,120,50" preferredShapeType="Class" subject="C9LxzuyCiu1SNw0z" xmi:id="89LxzuyCiu1SNw0y">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<captionBounds value="0,0,120,14"/>
+					<captionInternalWidth value="-2147483648"/>
+					<captionInternalHeight value="-2147483648"/>
+					<captionVisible value="true"/>
+					<captionSide value="12"/>
+					<properties>
+						<abackground value="Cr:192,192,192,255"/>
+						<aforeground value="Cr:0,0,0,255"/>
 						<azOrder value="8"/>
 						<acreatorDiagramType value="ClassDiagram"/>
 						<aselectable value="true"/>
@@ -12520,471 +13456,42 @@
 				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
 				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
 			</uml:DiagramElement>
-			<uml:DiagramElement geometry="280,170;280,309;" preferredShapeType="AssociationClass" subject="N.hRzuyCiu1SNwzM" xmi:id="N.hRzuyCiu1SNwzN">
-				<xmi:Extension extender="Visual Paradigm for UML">
-					<captionBounds value="290,259,20,0"/>
-					<captionInternalWidth value="-2147483648"/>
-					<captionInternalHeight value="-2147483648"/>
-					<captionVisible value="true"/>
-					<captionSide value="1"/>
-					<properties>
-						<abackground value="Cr:122,207,245,255"/>
-						<aforeground value="Cr:0,0,0,255"/>
-						<azOrder value="-1"/>
-						<aselectable value="true"/>
-						<arequestResetCaption value="false"/>
-						<arequestResetCaptionSize value="false"/>
-						<aconnectorStyle value="3"/>
-						<aconnectorLineJumps value="4"/>
-						<aconnectorLabelOrientation value="4"/>
-						<afromShapeXDiff value="0"/>
-						<afromShapeYDiff value="0"/>
-						<atoShapeXDiff value="0"/>
-						<atoShapeYDiff value="0"/>
-						<afromConnectType value="0"/>
-						<atoConnectType value="0"/>
-						<auseFromShapeCenter value="true"/>
-						<auseToShapeCenter value="true"/>
-						<afromPinType value="1"/>
-						<atoPinType value="1"/>
-						<arequestRebuild value="false"/>
-						<ashowConnectorName value="2"/>
-						<apaintThroughLabel value="2"/>
-					</properties>
-				</xmi:Extension>
-				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
-				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
-			</uml:DiagramElement>
-			<uml:DiagramElement geometry="640,310,80,40" preferredShapeType="Class" subject="CIdRzuyCiu1SNwzZ" xmi:id="8IdRzuyCiu1SNwzY">
-				<xmi:Extension extender="Visual Paradigm for UML">
-					<captionBounds value="0,0,80,14"/>
-					<captionInternalWidth value="-2147483648"/>
-					<captionInternalHeight value="-2147483648"/>
-					<captionVisible value="true"/>
-					<captionSide value="12"/>
-					<properties>
-						<abackground value="Cr:122,207,245,255"/>
-						<aforeground value="Cr:0,0,0,255"/>
-						<azOrder value="6"/>
-						<acreatorDiagramType value="ClassDiagram"/>
-						<aselectable value="true"/>
-						<arequestResetCaption value="false"/>
-						<arequestResetCaptionSize value="false"/>
-						<adisplayStereotypeIcon value="false"/>
-						<aoverrideAppearanceWithStereotypeIcon value="true"/>
-						<arequestSetSizeOption value="0"/>
-						<aparentConnectorHeaderLength value="40"/>
-						<aparentConnectorLineLength value="10"/>
-						<aconnectToPoint value="true"/>
-						<aparentConnectorDTheta value="0.0"/>
-						<aconnectionPointType value="2"/>
-						<amodelElementNameAlignment value="9"/>
-						<arequestDefaultSize value="false"/>
-						<arequestFitSize value="false"/>
-						<arequestFitSizeFromCenter value="false"/>
-						<adisplayAsRobustnessAnalysisIcon value="true"/>
-						<avisibilityStyle value="1"/>
-						<ashowAttributeType value="1"/>
-						<ashowOperationType value="1"/>
-						<amSwTpPts value="true"/>
-						<alshRfAts value="true"/>
-						<amShDrAt value="false"/>
-						<akShDrOp value="false"/>
-						<akSwCsMbSt value="true"/>
-						<ashowClassMemberConstraints value="true"/>
-						<alShCmMl value="false"/>
-						<ashowOperationParameterDirection value="false"/>
-						<ashowOperationRaisedExceptions value="false"/>
-						<ashowParameterNameInOperationSignature value="true"/>
-						<ashowOperationTemplateParameters value="false"/>
-						<ashowOperationProperties value="false"/>
-						<awpMbs value="false"/>
-						<aattributeSortType value="0"/>
-						<aoperationSortType value="0"/>
-						<ashowInitialAttributeValue value="true"/>
-						<ashowOperationSignature value="true"/>
-						<ainterfaceBall value="false"/>
-						<ashowEmptyCompartments value="0"/>
-						<ashowEllipsisForUnshownMembers value="0"/>
-						<ashowAttributesCodeDetails value="0"/>
-						<ashowOperationsCodeDetails value="0"/>
-						<ashowParametersCodeDetails value="0"/>
-						<ashowTypeOption value="0"/>
-						<ashowOwnerOption value="3"/>
-						<ashowAttributesType value="0"/>
-						<ashowOperationsParameters value="0"/>
-						<ashowOperationsReturnType value="0"/>
-					</properties>
-				</xmi:Extension>
-				<elementFill color1="Cr:122,207,245,255" color2="" style="1" transparency="0" type="1"/>
-				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
-				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
-			</uml:DiagramElement>
-			<uml:DiagramElement geometry="680,190;680,309;" preferredShapeType="Generalization" subject="cELRzuyCiu1SNwzd" xmi:id="cELRzuyCiu1SNwze">
-				<xmi:Extension extender="Visual Paradigm for UML">
-					<captionBounds value="680,249,20,0"/>
-					<captionInternalWidth value="-2147483648"/>
-					<captionInternalHeight value="-2147483648"/>
-					<captionVisible value="true"/>
-					<captionSide value="1"/>
-					<properties>
-						<abackground value="Cr:255,255,255,255"/>
-						<aforeground value="Cr:0,0,0,255"/>
-						<azOrder value="-1"/>
-						<acreatorDiagramType value="ClassDiagram"/>
-						<aselectable value="true"/>
-						<arequestResetCaption value="false"/>
-						<arequestResetCaptionSize value="false"/>
-						<aconnectorStyle value="3"/>
-						<aconnectorLineJumps value="4"/>
-						<aconnectorLabelOrientation value="4"/>
-						<afromShapeXDiff value="0"/>
-						<afromShapeYDiff value="0"/>
-						<atoShapeXDiff value="0"/>
-						<atoShapeYDiff value="0"/>
-						<afromConnectType value="0"/>
-						<atoConnectType value="0"/>
-						<auseFromShapeCenter value="true"/>
-						<auseToShapeCenter value="true"/>
-						<afromPinType value="1"/>
-						<atoPinType value="1"/>
-						<arequestRebuild value="false"/>
-						<ashowConnectorName value="2"/>
-						<apaintThroughLabel value="2"/>
-					</properties>
-				</xmi:Extension>
-				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
-				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
-			</uml:DiagramElement>
-			<uml:DiagramElement geometry="330,330;639,330;" preferredShapeType="Association" subject="tG7RzuyCiu1SNwzq" xmi:id="9G7RzuyCiu1SNwzv">
-				<xmi:Extension extender="Visual Paradigm for UML">
-					<captionBounds value="460,333,44,14"/>
-					<captionInternalWidth value="-2147483648"/>
-					<captionInternalHeight value="-2147483648"/>
-					<captionVisible value="true"/>
-					<captionSide value="1"/>
-					<properties>
-						<abackground value="Cr:122,207,245,255"/>
-						<aforeground value="Cr:0,0,0,255"/>
-						<azOrder value="-1"/>
-						<acreatorDiagramType value="ClassDiagram"/>
-						<aselectable value="true"/>
-						<arequestResetCaption value="false"/>
-						<arequestResetCaptionSize value="false"/>
-						<aconnectorStyle value="3"/>
-						<aconnectorLineJumps value="4"/>
-						<aconnectorLabelOrientation value="4"/>
-						<afromShapeXDiff value="0"/>
-						<afromShapeYDiff value="0"/>
-						<atoShapeXDiff value="0"/>
-						<atoShapeYDiff value="0"/>
-						<afromConnectType value="0"/>
-						<atoConnectType value="0"/>
-						<auseFromShapeCenter value="true"/>
-						<auseToShapeCenter value="true"/>
-						<afromPinType value="1"/>
-						<atoPinType value="1"/>
-						<arequestRebuild value="false"/>
-						<ashowConnectorName value="2"/>
-						<apaintThroughLabel value="2"/>
-						<ahasRoleAShape value="false"/>
-						<ahasRoleBShape value="false"/>
-						<ashowMultiplicityConstraints value="false"/>
-						<ahasMultiplicityAShape value="false"/>
-						<ahasMultiplicityBShape value="false"/>
-						<a0SwDr value="false"/>
-						<ashowStereotypes value="true"/>
-						<ashowFromRoleName value="true"/>
-						<ashowToRoleName value="true"/>
-						<ashowFromMultiplicity value="true"/>
-						<ashowToMultiplicity value="true"/>
-						<ashowFromRoleVisibility value="true"/>
-						<ashowToRoleVisibility value="true"/>
-						<ashowAssociationEndPropertyStrings value="false"/>
-						<ahasAssociationEndPropertyStringsAShape value="false"/>
-						<ahasAssociationEndPropertyStringsBShape value="false"/>
-						<afromRoleInternalWidth value="-2147483648"/>
-						<afromRoleInternalHeight value="-2147483648"/>
-						<atoRoleInternalWidth value="-2147483648"/>
-						<atoRoleInternalHeight value="-2147483648"/>
-						<afromMultiplicityInternalWidth value="-2147483648"/>
-						<afromMultiplicityInternalHeight value="-2147483648"/>
-						<atoMultiplicityInternalWidth value="-2147483648"/>
-						<atoMultiplicityInternalHeight value="-2147483648"/>
-						<aassociationEndPropertyStringsAInternalWidth value="-2147483648"/>
-						<aassociationEndPropertyStringsAInternalHeight value="-2147483648"/>
-						<aassociationEndPropertyStringsBInternalWidth value="-2147483648"/>
-						<aassociationEndPropertyStringsBInternalHeight value="-2147483648"/>
-					</properties>
-				</xmi:Extension>
-				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
-				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
-			</uml:DiagramElement>
-			<uml:DiagramElement geometry="370,260,120,50" preferredShapeType="Class" subject="qmwxzuyCiu1SNwz5" xmi:id="qmwxzuyCiu1SNwz4">
-				<xmi:Extension extender="Visual Paradigm for UML">
-					<captionBounds value="0,0,120,14"/>
-					<captionInternalWidth value="-2147483648"/>
-					<captionInternalHeight value="-2147483648"/>
-					<captionVisible value="true"/>
-					<captionSide value="12"/>
-					<properties>
-						<abackground value="Cr:192,192,192,255"/>
-						<aforeground value="Cr:0,0,0,255"/>
-						<azOrder value="4"/>
-						<acreatorDiagramType value="ClassDiagram"/>
-						<aselectable value="true"/>
-						<arequestResetCaption value="false"/>
-						<arequestResetCaptionSize value="false"/>
-						<adisplayStereotypeIcon value="false"/>
-						<aoverrideAppearanceWithStereotypeIcon value="true"/>
-						<arequestSetSizeOption value="0"/>
-						<aparentConnectorHeaderLength value="40"/>
-						<aparentConnectorLineLength value="10"/>
-						<aconnectToPoint value="true"/>
-						<aparentConnectorDTheta value="0.0"/>
-						<aconnectionPointType value="2"/>
-						<amodelElementNameAlignment value="9"/>
-						<arequestDefaultSize value="false"/>
-						<arequestFitSize value="false"/>
-						<arequestFitSizeFromCenter value="false"/>
-						<adisplayAsRobustnessAnalysisIcon value="true"/>
-						<avisibilityStyle value="1"/>
-						<ashowAttributeType value="1"/>
-						<ashowOperationType value="1"/>
-						<amSwTpPts value="true"/>
-						<alshRfAts value="true"/>
-						<amShDrAt value="false"/>
-						<akShDrOp value="false"/>
-						<akSwCsMbSt value="true"/>
-						<ashowClassMemberConstraints value="true"/>
-						<alShCmMl value="false"/>
-						<ashowOperationParameterDirection value="false"/>
-						<ashowOperationRaisedExceptions value="false"/>
-						<ashowParameterNameInOperationSignature value="true"/>
-						<ashowOperationTemplateParameters value="false"/>
-						<ashowOperationProperties value="false"/>
-						<awpMbs value="false"/>
-						<aattributeSortType value="0"/>
-						<aoperationSortType value="0"/>
-						<ashowInitialAttributeValue value="true"/>
-						<ashowOperationSignature value="true"/>
-						<ainterfaceBall value="false"/>
-						<ashowEmptyCompartments value="0"/>
-						<ashowEllipsisForUnshownMembers value="0"/>
-						<ashowAttributesCodeDetails value="0"/>
-						<ashowOperationsCodeDetails value="0"/>
-						<ashowParametersCodeDetails value="0"/>
-						<ashowTypeOption value="0"/>
-						<ashowOwnerOption value="3"/>
-						<ashowAttributesType value="0"/>
-						<ashowOperationsParameters value="0"/>
-						<ashowOperationsReturnType value="0"/>
-					</properties>
-				</xmi:Extension>
-				<elementFill color1="Cr:192,192,192,255" color2="" style="1" transparency="0" type="1"/>
-				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
-				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
-			</uml:DiagramElement>
-			<uml:DiagramElement geometry="450,230;450,259;" preferredShapeType="AssociationClass" subject="1DMxzuyCiu1SNw0F" xmi:id="1DMxzuyCiu1SNw0G">
-				<xmi:Extension extender="Visual Paradigm for UML">
-					<captionBounds value="460,259,20,0"/>
-					<captionInternalWidth value="-2147483648"/>
-					<captionInternalHeight value="-2147483648"/>
-					<captionVisible value="true"/>
-					<captionSide value="1"/>
-					<properties>
-						<abackground value="Cr:122,207,245,255"/>
-						<aforeground value="Cr:0,0,0,255"/>
-						<azOrder value="-1"/>
-						<aselectable value="true"/>
-						<arequestResetCaption value="false"/>
-						<arequestResetCaptionSize value="false"/>
-						<aconnectorStyle value="3"/>
-						<aconnectorLineJumps value="4"/>
-						<aconnectorLabelOrientation value="4"/>
-						<afromShapeXDiff value="0"/>
-						<afromShapeYDiff value="0"/>
-						<atoShapeXDiff value="0"/>
-						<atoShapeYDiff value="0"/>
-						<afromConnectType value="0"/>
-						<atoConnectType value="0"/>
-						<auseFromShapeCenter value="true"/>
-						<auseToShapeCenter value="true"/>
-						<afromPinType value="1"/>
-						<atoPinType value="1"/>
-						<arequestRebuild value="false"/>
-						<ashowConnectorName value="2"/>
-						<apaintThroughLabel value="2"/>
-					</properties>
-				</xmi:Extension>
-				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
-				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
-			</uml:DiagramElement>
-			<uml:DiagramElement geometry="369,270;180,270;180,220;" preferredShapeType="Association" subject="iyCxzuyCiu1SNw0N" xmi:id="iyCxzuyCiu1SNw0S">
-				<xmi:Extension extender="Visual Paradigm for UML">
-					<captionBounds value="202,271,58,14"/>
-					<captionInternalWidth value="-2147483648"/>
-					<captionInternalHeight value="-2147483648"/>
-					<captionVisible value="true"/>
-					<captionSide value="1"/>
-					<properties>
-						<abackground value="Cr:122,207,245,255"/>
-						<aforeground value="Cr:0,0,0,255"/>
-						<azOrder value="-1"/>
-						<acreatorDiagramType value="ClassDiagram"/>
-						<aselectable value="true"/>
-						<arequestResetCaption value="false"/>
-						<arequestResetCaptionSize value="false"/>
-						<aconnectorStyle value="3"/>
-						<aconnectorLineJumps value="4"/>
-						<aconnectorLabelOrientation value="4"/>
-						<afromShapeXDiff value="0"/>
-						<afromShapeYDiff value="0"/>
-						<atoShapeXDiff value="0"/>
-						<atoShapeYDiff value="0"/>
-						<afromConnectType value="0"/>
-						<atoConnectType value="0"/>
-						<auseFromShapeCenter value="true"/>
-						<auseToShapeCenter value="true"/>
-						<afromPinType value="1"/>
-						<atoPinType value="1"/>
-						<arequestRebuild value="false"/>
-						<ashowConnectorName value="2"/>
-						<apaintThroughLabel value="2"/>
-						<ahasRoleAShape value="false"/>
-						<ahasRoleBShape value="false"/>
-						<ashowMultiplicityConstraints value="false"/>
-						<ahasMultiplicityAShape value="false"/>
-						<ahasMultiplicityBShape value="false"/>
-						<a0SwDr value="false"/>
-						<ashowStereotypes value="true"/>
-						<ashowFromRoleName value="true"/>
-						<ashowToRoleName value="true"/>
-						<ashowFromMultiplicity value="true"/>
-						<ashowToMultiplicity value="true"/>
-						<ashowFromRoleVisibility value="true"/>
-						<ashowToRoleVisibility value="true"/>
-						<ashowAssociationEndPropertyStrings value="false"/>
-						<ahasAssociationEndPropertyStringsAShape value="false"/>
-						<ahasAssociationEndPropertyStringsBShape value="false"/>
-						<afromRoleInternalWidth value="-2147483648"/>
-						<afromRoleInternalHeight value="-2147483648"/>
-						<atoRoleInternalWidth value="-2147483648"/>
-						<atoRoleInternalHeight value="-2147483648"/>
-						<afromMultiplicityInternalWidth value="-2147483648"/>
-						<afromMultiplicityInternalHeight value="-2147483648"/>
-						<atoMultiplicityInternalWidth value="-2147483648"/>
-						<atoMultiplicityInternalHeight value="-2147483648"/>
-						<aassociationEndPropertyStringsAInternalWidth value="-2147483648"/>
-						<aassociationEndPropertyStringsAInternalHeight value="-2147483648"/>
-						<aassociationEndPropertyStringsBInternalWidth value="-2147483648"/>
-						<aassociationEndPropertyStringsBInternalHeight value="-2147483648"/>
-					</properties>
-				</xmi:Extension>
-				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
-				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
-			</uml:DiagramElement>
-			<uml:DiagramElement geometry="510,260,120,50" preferredShapeType="Class" subject="C9LxzuyCiu1SNw0z" xmi:id="89LxzuyCiu1SNw0y">
-				<xmi:Extension extender="Visual Paradigm for UML">
-					<captionBounds value="0,0,120,14"/>
-					<captionInternalWidth value="-2147483648"/>
-					<captionInternalHeight value="-2147483648"/>
-					<captionVisible value="true"/>
-					<captionSide value="12"/>
-					<properties>
-						<abackground value="Cr:192,192,192,255"/>
-						<aforeground value="Cr:0,0,0,255"/>
-						<azOrder value="2"/>
-						<acreatorDiagramType value="ClassDiagram"/>
-						<aselectable value="true"/>
-						<arequestResetCaption value="false"/>
-						<arequestResetCaptionSize value="false"/>
-						<adisplayStereotypeIcon value="false"/>
-						<aoverrideAppearanceWithStereotypeIcon value="true"/>
-						<arequestSetSizeOption value="0"/>
-						<aparentConnectorHeaderLength value="40"/>
-						<aparentConnectorLineLength value="10"/>
-						<aconnectToPoint value="true"/>
-						<aparentConnectorDTheta value="0.0"/>
-						<aconnectionPointType value="2"/>
-						<amodelElementNameAlignment value="9"/>
-						<arequestDefaultSize value="false"/>
-						<arequestFitSize value="false"/>
-						<arequestFitSizeFromCenter value="false"/>
-						<adisplayAsRobustnessAnalysisIcon value="true"/>
-						<avisibilityStyle value="1"/>
-						<ashowAttributeType value="1"/>
-						<ashowOperationType value="1"/>
-						<amSwTpPts value="true"/>
-						<alshRfAts value="true"/>
-						<amShDrAt value="false"/>
-						<akShDrOp value="false"/>
-						<akSwCsMbSt value="true"/>
-						<ashowClassMemberConstraints value="true"/>
-						<alShCmMl value="false"/>
-						<ashowOperationParameterDirection value="false"/>
-						<ashowOperationRaisedExceptions value="false"/>
-						<ashowParameterNameInOperationSignature value="true"/>
-						<ashowOperationTemplateParameters value="false"/>
-						<ashowOperationProperties value="false"/>
-						<awpMbs value="false"/>
-						<aattributeSortType value="0"/>
-						<aoperationSortType value="0"/>
-						<ashowInitialAttributeValue value="true"/>
-						<ashowOperationSignature value="true"/>
-						<ainterfaceBall value="false"/>
-						<ashowEmptyCompartments value="0"/>
-						<ashowEllipsisForUnshownMembers value="0"/>
-						<ashowAttributesCodeDetails value="0"/>
-						<ashowOperationsCodeDetails value="0"/>
-						<ashowParametersCodeDetails value="0"/>
-						<ashowTypeOption value="0"/>
-						<ashowOwnerOption value="3"/>
-						<ashowAttributesType value="0"/>
-						<ashowOperationsParameters value="0"/>
-						<ashowOperationsReturnType value="0"/>
-					</properties>
-				</xmi:Extension>
-				<elementFill color1="Cr:192,192,192,255" color2="" style="1" transparency="0" type="1"/>
-				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
-				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
-			</uml:DiagramElement>
-			<uml:DiagramElement geometry="560,160;560,259;" preferredShapeType="AssociationClass" subject="FMPxzuyCiu1SNw08" xmi:id="FMPxzuyCiu1SNw09">
-				<xmi:Extension extender="Visual Paradigm for UML">
-					<captionBounds value="570,229,20,0"/>
-					<captionInternalWidth value="-2147483648"/>
-					<captionInternalHeight value="-2147483648"/>
-					<captionVisible value="true"/>
-					<captionSide value="1"/>
-					<properties>
-						<abackground value="Cr:122,207,245,255"/>
-						<aforeground value="Cr:0,0,0,255"/>
-						<azOrder value="-1"/>
-						<aselectable value="true"/>
-						<arequestResetCaption value="false"/>
-						<arequestResetCaptionSize value="false"/>
-						<aconnectorStyle value="3"/>
-						<aconnectorLineJumps value="4"/>
-						<aconnectorLabelOrientation value="4"/>
-						<afromShapeXDiff value="0"/>
-						<afromShapeYDiff value="0"/>
-						<atoShapeXDiff value="0"/>
-						<atoShapeYDiff value="0"/>
-						<afromConnectType value="0"/>
-						<atoConnectType value="0"/>
-						<auseFromShapeCenter value="true"/>
-						<auseToShapeCenter value="true"/>
-						<afromPinType value="1"/>
-						<atoPinType value="1"/>
-						<arequestRebuild value="false"/>
-						<ashowConnectorName value="2"/>
-						<apaintThroughLabel value="2"/>
-					</properties>
-				</xmi:Extension>
-				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
-				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
-			</uml:DiagramElement>
-			<uml:DiagramElement geometry="92,96,676,164" preferredShapeType="SECurveShape" subject="XHTOHuyCiu1SNxIe" xmi:id="XHTOHuyCiu1SNxId">
+			<uml:DiagramElement geometry="593,88;593,197;" preferredShapeType="AssociationClass" subject="FMPxzuyCiu1SNw08" xmi:id="FMPxzuyCiu1SNw09">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<captionBounds value="603,162,20,0"/>
+					<captionInternalWidth value="-2147483648"/>
+					<captionInternalHeight value="-2147483648"/>
+					<captionVisible value="true"/>
+					<captionSide value="1"/>
+					<properties>
+						<abackground value="Cr:122,207,245,255"/>
+						<aforeground value="Cr:0,0,0,255"/>
+						<azOrder value="-1"/>
+						<aselectable value="true"/>
+						<arequestResetCaption value="false"/>
+						<arequestResetCaptionSize value="false"/>
+						<aconnectorStyle value="3"/>
+						<aconnectorLineJumps value="4"/>
+						<aconnectorLabelOrientation value="4"/>
+						<afromShapeXDiff value="0"/>
+						<afromShapeYDiff value="0"/>
+						<atoShapeXDiff value="0"/>
+						<atoShapeYDiff value="0"/>
+						<afromConnectType value="0"/>
+						<atoConnectType value="0"/>
+						<auseFromShapeCenter value="true"/>
+						<auseToShapeCenter value="true"/>
+						<afromPinType value="1"/>
+						<atoPinType value="1"/>
+						<arequestRebuild value="false"/>
+						<ashowConnectorName value="2"/>
+						<apaintThroughLabel value="2"/>
+					</properties>
+				</xmi:Extension>
+				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
+				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
+			</uml:DiagramElement>
+			<uml:DiagramElement geometry="92,24,676,164" preferredShapeType="SECurveShape" subject="XHTOHuyCiu1SNxIe" xmi:id="XHTOHuyCiu1SNxId">
 				<xmi:Extension extender="Visual Paradigm for UML">
 					<captionBounds value="0,0,40,40"/>
 					<captionInternalWidth value="-2147483648"/>
@@ -12994,7 +13501,7 @@
 					<properties>
 						<abackground value="Cr:255,255,192,127"/>
 						<aforeground value="Cr:192,192,192,255"/>
-						<azOrder value="16"/>
+						<azOrder value="22"/>
 						<aselectable value="true"/>
 						<arequestResetCaption value="false"/>
 						<arequestResetCaptionSize value="false"/>
@@ -13065,7 +13572,7 @@
 				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
 				<elementLine color="Cr:192,192,192,255" style="1" transparency="0" weight="1.0"/>
 			</uml:DiagramElement>
-			<uml:DiagramElement geometry="7,304,141,65" preferredShapeType="NOTE" subject="afB2HuyCiu1SNxHe" xmi:id="S5YuHuyCiu1SNxI3">
+			<uml:DiagramElement geometry="7,212,141,65" preferredShapeType="NOTE" subject="afB2HuyCiu1SNxHe" xmi:id="S5YuHuyCiu1SNxI3">
 				<xmi:Extension extender="Visual Paradigm for UML">
 					<captionBounds value="0,0,141,0"/>
 					<captionInternalWidth value="-2147483648"/>
@@ -13075,7 +13582,7 @@
 					<properties>
 						<abackground value="Cr:255,255,192,127"/>
 						<aforeground value="Cr:0,0,0,255"/>
-						<azOrder value="0"/>
+						<azOrder value="6"/>
 						<aselectable value="true"/>
 						<arequestResetCaption value="false"/>
 						<arequestResetCaptionSize value="false"/>
@@ -13098,15 +13605,318 @@
 				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
 				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
 			</uml:DiagramElement>
-			<uml:DiagramElement geometry="114,303;114,260;" preferredShapeType="Anchor" subject="lK0uHuyCiu1SNxI7" xmi:id="lK0uHuyCiu1SNxI8">
-				<xmi:Extension extender="Visual Paradigm for UML">
-					<captionBounds value="114,282,20,0"/>
-					<captionInternalWidth value="-2147483648"/>
-					<captionInternalHeight value="-2147483648"/>
-					<captionVisible value="true"/>
-					<captionSide value="1"/>
-					<properties>
-						<abackground value="Cr:122,207,245,255"/>
+			<uml:DiagramElement geometry="114,211;114,188;" preferredShapeType="Anchor" subject="lK0uHuyCiu1SNxI7" xmi:id="lK0uHuyCiu1SNxI8">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<captionBounds value="114,200,20,0"/>
+					<captionInternalWidth value="-2147483648"/>
+					<captionInternalHeight value="-2147483648"/>
+					<captionVisible value="true"/>
+					<captionSide value="1"/>
+					<properties>
+						<abackground value="Cr:122,207,245,255"/>
+						<aforeground value="Cr:0,0,0,255"/>
+						<azOrder value="-1"/>
+						<acreatorDiagramType value="ClassDiagram"/>
+						<aselectable value="true"/>
+						<arequestResetCaption value="false"/>
+						<arequestResetCaptionSize value="false"/>
+						<aconnectorStyle value="3"/>
+						<aconnectorLineJumps value="4"/>
+						<aconnectorLabelOrientation value="4"/>
+						<afromShapeXDiff value="0"/>
+						<afromShapeYDiff value="0"/>
+						<atoShapeXDiff value="0"/>
+						<atoShapeYDiff value="0"/>
+						<afromConnectType value="0"/>
+						<atoConnectType value="0"/>
+						<auseFromShapeCenter value="true"/>
+						<auseToShapeCenter value="true"/>
+						<afromPinType value="1"/>
+						<atoPinType value="1"/>
+						<arequestRebuild value="false"/>
+						<ashowConnectorName value="2"/>
+						<apaintThroughLabel value="2"/>
+					</properties>
+				</xmi:Extension>
+				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
+				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
+			</uml:DiagramElement>
+			<uml:DiagramElement geometry="267,363,105,40" preferredShapeType="Class" subject="4V6W3uyCiu1SNxTH" xmi:id="Fl6W3uyCiu1SNxTG">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<captionBounds value="0,0,105,28"/>
+					<captionInternalWidth value="-2147483648"/>
+					<captionInternalHeight value="-2147483648"/>
+					<captionVisible value="true"/>
+					<captionSide value="12"/>
+					<properties>
+						<abackground value="Cr:179,214,249,255"/>
+						<aforeground value="Cr:0,0,0,255"/>
+						<azOrder value="4"/>
+						<acreatorDiagramType value="ClassDiagram"/>
+						<aselectable value="true"/>
+						<arequestResetCaption value="false"/>
+						<arequestResetCaptionSize value="false"/>
+						<adisplayStereotypeIcon value="false"/>
+						<aoverrideAppearanceWithStereotypeIcon value="true"/>
+						<arequestSetSizeOption value="0"/>
+						<aparentConnectorHeaderLength value="40"/>
+						<aparentConnectorLineLength value="10"/>
+						<aconnectToPoint value="true"/>
+						<aparentConnectorDTheta value="0.0"/>
+						<aconnectionPointType value="2"/>
+						<amodelElementNameAlignment value="9"/>
+						<arequestDefaultSize value="false"/>
+						<arequestFitSize value="false"/>
+						<arequestFitSizeFromCenter value="false"/>
+						<adisplayAsRobustnessAnalysisIcon value="true"/>
+						<avisibilityStyle value="1"/>
+						<ashowAttributeType value="1"/>
+						<ashowOperationType value="1"/>
+						<amSwTpPts value="true"/>
+						<alshRfAts value="true"/>
+						<amShDrAt value="false"/>
+						<akShDrOp value="false"/>
+						<akSwCsMbSt value="true"/>
+						<ashowClassMemberConstraints value="true"/>
+						<alShCmMl value="false"/>
+						<ashowOperationParameterDirection value="false"/>
+						<ashowOperationRaisedExceptions value="false"/>
+						<ashowParameterNameInOperationSignature value="true"/>
+						<ashowOperationTemplateParameters value="false"/>
+						<ashowOperationProperties value="false"/>
+						<awpMbs value="false"/>
+						<aattributeSortType value="0"/>
+						<aoperationSortType value="0"/>
+						<ashowInitialAttributeValue value="true"/>
+						<ashowOperationSignature value="true"/>
+						<ainterfaceBall value="false"/>
+						<ashowEmptyCompartments value="0"/>
+						<ashowEllipsisForUnshownMembers value="0"/>
+						<ashowAttributesCodeDetails value="0"/>
+						<ashowOperationsCodeDetails value="0"/>
+						<ashowParametersCodeDetails value="0"/>
+						<ashowTypeOption value="0"/>
+						<ashowOwnerOption value="3"/>
+						<ashowAttributesType value="0"/>
+						<ashowOperationsParameters value="0"/>
+						<ashowOperationsReturnType value="0"/>
+					</properties>
+				</xmi:Extension>
+				<elementFill color1="Cr:179,214,249,255" color2="" style="1" transparency="0" type="1"/>
+				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
+				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
+			</uml:DiagramElement>
+			<uml:DiagramElement geometry="395,364,105,40" preferredShapeType="Class" subject="RB2W3uyCiu1SNxTP" xmi:id="hB2W3uyCiu1SNxTO">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<captionBounds value="0,0,105,28"/>
+					<captionInternalWidth value="-2147483648"/>
+					<captionInternalHeight value="-2147483648"/>
+					<captionVisible value="true"/>
+					<captionSide value="12"/>
+					<properties>
+						<abackground value="Cr:179,214,249,255"/>
+						<aforeground value="Cr:0,0,0,255"/>
+						<azOrder value="2"/>
+						<acreatorDiagramType value="ClassDiagram"/>
+						<aselectable value="true"/>
+						<arequestResetCaption value="false"/>
+						<arequestResetCaptionSize value="false"/>
+						<adisplayStereotypeIcon value="false"/>
+						<aoverrideAppearanceWithStereotypeIcon value="true"/>
+						<arequestSetSizeOption value="0"/>
+						<aparentConnectorHeaderLength value="40"/>
+						<aparentConnectorLineLength value="10"/>
+						<aconnectToPoint value="true"/>
+						<aparentConnectorDTheta value="0.0"/>
+						<aconnectionPointType value="2"/>
+						<amodelElementNameAlignment value="9"/>
+						<arequestDefaultSize value="false"/>
+						<arequestFitSize value="false"/>
+						<arequestFitSizeFromCenter value="false"/>
+						<adisplayAsRobustnessAnalysisIcon value="true"/>
+						<avisibilityStyle value="1"/>
+						<ashowAttributeType value="1"/>
+						<ashowOperationType value="1"/>
+						<amSwTpPts value="true"/>
+						<alshRfAts value="true"/>
+						<amShDrAt value="false"/>
+						<akShDrOp value="false"/>
+						<akSwCsMbSt value="true"/>
+						<ashowClassMemberConstraints value="true"/>
+						<alShCmMl value="false"/>
+						<ashowOperationParameterDirection value="false"/>
+						<ashowOperationRaisedExceptions value="false"/>
+						<ashowParameterNameInOperationSignature value="true"/>
+						<ashowOperationTemplateParameters value="false"/>
+						<ashowOperationProperties value="false"/>
+						<awpMbs value="false"/>
+						<aattributeSortType value="0"/>
+						<aoperationSortType value="0"/>
+						<ashowInitialAttributeValue value="true"/>
+						<ashowOperationSignature value="true"/>
+						<ainterfaceBall value="false"/>
+						<ashowEmptyCompartments value="0"/>
+						<ashowEllipsisForUnshownMembers value="0"/>
+						<ashowAttributesCodeDetails value="0"/>
+						<ashowOperationsCodeDetails value="0"/>
+						<ashowParametersCodeDetails value="0"/>
+						<ashowTypeOption value="0"/>
+						<ashowOwnerOption value="3"/>
+						<ashowAttributesType value="0"/>
+						<ashowOperationsParameters value="0"/>
+						<ashowOperationsReturnType value="0"/>
+					</properties>
+				</xmi:Extension>
+				<elementFill color1="Cr:179,214,249,255" color2="" style="1" transparency="0" type="1"/>
+				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
+				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
+			</uml:DiagramElement>
+			<uml:DiagramElement geometry="149,363,105,40" preferredShapeType="Class" subject="zuuW3uyCiu1SNxTU" xmi:id="zuuW3uyCiu1SNxTT">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<captionBounds value="0,0,105,28"/>
+					<captionInternalWidth value="-2147483648"/>
+					<captionInternalHeight value="-2147483648"/>
+					<captionVisible value="true"/>
+					<captionSide value="12"/>
+					<properties>
+						<abackground value="Cr:179,214,249,255"/>
+						<aforeground value="Cr:0,0,0,255"/>
+						<azOrder value="0"/>
+						<acreatorDiagramType value="ClassDiagram"/>
+						<aselectable value="true"/>
+						<arequestResetCaption value="false"/>
+						<arequestResetCaptionSize value="false"/>
+						<adisplayStereotypeIcon value="false"/>
+						<aoverrideAppearanceWithStereotypeIcon value="true"/>
+						<arequestSetSizeOption value="0"/>
+						<aparentConnectorHeaderLength value="40"/>
+						<aparentConnectorLineLength value="10"/>
+						<aconnectToPoint value="true"/>
+						<aparentConnectorDTheta value="0.0"/>
+						<aconnectionPointType value="2"/>
+						<amodelElementNameAlignment value="9"/>
+						<arequestDefaultSize value="false"/>
+						<arequestFitSize value="false"/>
+						<arequestFitSizeFromCenter value="false"/>
+						<adisplayAsRobustnessAnalysisIcon value="true"/>
+						<avisibilityStyle value="1"/>
+						<ashowAttributeType value="1"/>
+						<ashowOperationType value="1"/>
+						<amSwTpPts value="true"/>
+						<alshRfAts value="true"/>
+						<amShDrAt value="false"/>
+						<akShDrOp value="false"/>
+						<akSwCsMbSt value="true"/>
+						<ashowClassMemberConstraints value="true"/>
+						<alShCmMl value="false"/>
+						<ashowOperationParameterDirection value="false"/>
+						<ashowOperationRaisedExceptions value="false"/>
+						<ashowParameterNameInOperationSignature value="true"/>
+						<ashowOperationTemplateParameters value="false"/>
+						<ashowOperationProperties value="false"/>
+						<awpMbs value="false"/>
+						<aattributeSortType value="0"/>
+						<aoperationSortType value="0"/>
+						<ashowInitialAttributeValue value="true"/>
+						<ashowOperationSignature value="true"/>
+						<ainterfaceBall value="false"/>
+						<ashowEmptyCompartments value="0"/>
+						<ashowEllipsisForUnshownMembers value="0"/>
+						<ashowAttributesCodeDetails value="0"/>
+						<ashowOperationsCodeDetails value="0"/>
+						<ashowParametersCodeDetails value="0"/>
+						<ashowTypeOption value="0"/>
+						<ashowOwnerOption value="3"/>
+						<ashowAttributesType value="0"/>
+						<ashowOperationsParameters value="0"/>
+						<ashowOperationsReturnType value="0"/>
+					</properties>
+				</xmi:Extension>
+				<elementFill color1="Cr:179,214,249,255" color2="" style="1" transparency="0" type="1"/>
+				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
+				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
+			</uml:DiagramElement>
+			<uml:DiagramElement geometry="407,118;407,363;" preferredShapeType="Generalization" subject="BHNW3uyCiu1SNxT2" xmi:id="BHNW3uyCiu1SNxT3">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<captionBounds value="407,240,20,0"/>
+					<captionInternalWidth value="-2147483648"/>
+					<captionInternalHeight value="-2147483648"/>
+					<captionVisible value="true"/>
+					<captionSide value="1"/>
+					<properties>
+						<abackground value="Cr:255,255,255,255"/>
+						<aforeground value="Cr:0,0,0,255"/>
+						<azOrder value="-1"/>
+						<acreatorDiagramType value="ClassDiagram"/>
+						<aselectable value="true"/>
+						<arequestResetCaption value="false"/>
+						<arequestResetCaptionSize value="false"/>
+						<aconnectorStyle value="3"/>
+						<aconnectorLineJumps value="4"/>
+						<aconnectorLabelOrientation value="4"/>
+						<afromShapeXDiff value="0"/>
+						<afromShapeYDiff value="0"/>
+						<atoShapeXDiff value="0"/>
+						<atoShapeYDiff value="0"/>
+						<afromConnectType value="0"/>
+						<atoConnectType value="0"/>
+						<auseFromShapeCenter value="true"/>
+						<auseToShapeCenter value="true"/>
+						<afromPinType value="1"/>
+						<atoPinType value="1"/>
+						<arequestRebuild value="false"/>
+						<ashowConnectorName value="2"/>
+						<apaintThroughLabel value="2"/>
+					</properties>
+				</xmi:Extension>
+				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
+				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
+			</uml:DiagramElement>
+			<uml:DiagramElement geometry="382,118;382,125;371,363;" preferredShapeType="Generalization" subject="tJTW3uyCiu1SNxT." xmi:id="tJTW3uyCiu1SNxT_">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<captionBounds value="376,239,20,0"/>
+					<captionInternalWidth value="-2147483648"/>
+					<captionInternalHeight value="-2147483648"/>
+					<captionVisible value="true"/>
+					<captionSide value="1"/>
+					<properties>
+						<abackground value="Cr:255,255,255,255"/>
+						<aforeground value="Cr:0,0,0,255"/>
+						<azOrder value="-1"/>
+						<acreatorDiagramType value="ClassDiagram"/>
+						<aselectable value="true"/>
+						<arequestResetCaption value="false"/>
+						<arequestResetCaptionSize value="false"/>
+						<aconnectorStyle value="3"/>
+						<aconnectorLineJumps value="4"/>
+						<aconnectorLabelOrientation value="4"/>
+						<afromShapeXDiff value="0"/>
+						<afromShapeYDiff value="0"/>
+						<atoShapeXDiff value="0"/>
+						<atoShapeYDiff value="0"/>
+						<afromConnectType value="0"/>
+						<atoConnectType value="0"/>
+						<auseFromShapeCenter value="true"/>
+						<auseToShapeCenter value="true"/>
+						<afromPinType value="1"/>
+						<atoPinType value="1"/>
+						<arequestRebuild value="false"/>
+						<ashowConnectorName value="2"/>
+						<apaintThroughLabel value="2"/>
+					</properties>
+				</xmi:Extension>
+				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
+				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
+			</uml:DiagramElement>
+			<uml:DiagramElement geometry="371,118;296,328;254,363;" preferredShapeType="Generalization" subject="oCw23uyCiu1SNxUT" xmi:id="oCw23uyCiu1SNxUU">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<captionBounds value="323,252,20,0"/>
+					<captionInternalWidth value="-2147483648"/>
+					<captionInternalHeight value="-2147483648"/>
+					<captionVisible value="true"/>
+					<captionSide value="1"/>
+					<properties>
+						<abackground value="Cr:255,255,255,255"/>
 						<aforeground value="Cr:0,0,0,255"/>
 						<azOrder value="-1"/>
 						<acreatorDiagramType value="ClassDiagram"/>
@@ -13141,7 +13951,7 @@
 			<properties>
 				<apmAuthor value="lavm"/>
 				<apmCreateDateTime value="1337673922228"/>
-				<apmLastModified value="1337689857249"/>
+				<apmLastModified value="1337806320596"/>
 				<ashowPackageNameStyle value="0"/>
 				<ashowConnectorName value="0"/>
 				<apaintConnectorThroughLabel value="0"/>
@@ -13394,7 +14204,7 @@
 			<properties>
 				<apmAuthor value="lavm"/>
 				<apmCreateDateTime value="1337689857166"/>
-				<apmLastModified value="1337690584387"/>
+				<apmLastModified value="1337806342674"/>
 				<ashowPackageNameStyle value="0"/>
 				<ashowConnectorName value="0"/>
 				<apaintConnectorThroughLabel value="0"/>
@@ -13512,15 +14322,15 @@
 				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
 				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
 			</uml:DiagramElement>
-			<uml:DiagramElement geometry="140,110,80,40" preferredShapeType="Class" subject="XlvhLuyCiu1SNw38" xmi:id="XlvhLuyCiu1SNw37">
-				<xmi:Extension extender="Visual Paradigm for UML">
-					<captionBounds value="0,0,80,14"/>
+			<uml:DiagramElement geometry="138,110,105,40" preferredShapeType="Class" subject="XlvhLuyCiu1SNw38" xmi:id="XlvhLuyCiu1SNw37">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<captionBounds value="0,0,105,28"/>
 					<captionInternalWidth value="-2147483648"/>
 					<captionInternalHeight value="-2147483648"/>
 					<captionVisible value="true"/>
 					<captionSide value="12"/>
 					<properties>
-						<abackground value="Cr:122,207,245,255"/>
+						<abackground value="Cr:179,214,249,255"/>
 						<aforeground value="Cr:0,0,0,255"/>
 						<azOrder value="2"/>
 						<acreatorDiagramType value="ClassDiagram"/>
@@ -13573,13 +14383,13 @@
 						<ashowOperationsReturnType value="0"/>
 					</properties>
 				</xmi:Extension>
-				<elementFill color1="Cr:122,207,245,255" color2="" style="1" transparency="0" type="1"/>
-				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
-				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
-			</uml:DiagramElement>
-			<uml:DiagramElement geometry="419,120;220,120;" preferredShapeType="Generalization" subject="gt_hLuyCiu1SNw4A" xmi:id="gt_hLuyCiu1SNw4B">
-				<xmi:Extension extender="Visual Paradigm for UML">
-					<captionBounds value="310,130,20,0"/>
+				<elementFill color1="Cr:179,214,249,255" color2="" style="1" transparency="0" type="1"/>
+				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
+				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
+			</uml:DiagramElement>
+			<uml:DiagramElement geometry="419,120;243,120;" preferredShapeType="Generalization" subject="gt_hLuyCiu1SNw4A" xmi:id="gt_hLuyCiu1SNw4B">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<captionBounds value="321,130,20,0"/>
 					<captionInternalWidth value="-2147483648"/>
 					<captionInternalHeight value="-2147483648"/>
 					<captionVisible value="true"/>
@@ -13613,9 +14423,9 @@
 				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
 				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
 			</uml:DiagramElement>
-			<uml:DiagramElement geometry="419,140;220,140;" preferredShapeType="Association" subject="FwURLuyCiu1SNw4J" xmi:id="FwURLuyCiu1SNw4O">
-				<xmi:Extension extender="Visual Paradigm for UML">
-					<captionBounds value="260,142,109,14"/>
+			<uml:DiagramElement geometry="419,140;243,140;" preferredShapeType="Association" subject="FwURLuyCiu1SNw4J" xmi:id="FwURLuyCiu1SNw4O">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<captionBounds value="270,142,109,14"/>
 					<captionInternalWidth value="-2147483648"/>
 					<captionInternalHeight value="-2147483648"/>
 					<captionVisible value="true"/>
@@ -13912,7 +14722,7 @@
 			<properties>
 				<apmAuthor value="lavm"/>
 				<apmCreateDateTime value="1337690442410"/>
-				<apmLastModified value="1337724659136"/>
+				<apmLastModified value="1337876727401"/>
 				<ashowPackageNameStyle value="0"/>
 				<ashowConnectorName value="0"/>
 				<apaintConnectorThroughLabel value="0"/>
@@ -13940,7 +14750,7 @@
 				<ax value="0"/>
 				<ay value="0"/>
 				<awidth value="1235"/>
-				<aheight value="708"/>
+				<aheight value="450"/>
 				<aqualityScore value="-1"/>
 				<aparentModel value="NVoJLuyCiu1SNw6D"/>
 				<a_globalPaletteOption value="true"/>
@@ -13976,7 +14786,7 @@
 					<properties>
 						<abackground value="Cr:122,207,245,255"/>
 						<aforeground value="Cr:0,0,0,255"/>
-						<azOrder value="11"/>
+						<azOrder value="14"/>
 						<aselectable value="true"/>
 						<arequestResetCaption value="false"/>
 						<arequestResetCaptionSize value="false"/>
@@ -14030,17 +14840,17 @@
 				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
 				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
 			</uml:DiagramElement>
-			<uml:DiagramElement geometry="500,40,80,40" preferredShapeType="Class" subject="Jc2JLuyCiu1SNw6o" xmi:id="xc2JLuyCiu1SNw6n">
-				<xmi:Extension extender="Visual Paradigm for UML">
-					<captionBounds value="0,0,80,14"/>
+			<uml:DiagramElement geometry="500,40,110,40" preferredShapeType="Class" subject="Jc2JLuyCiu1SNw6o" xmi:id="xc2JLuyCiu1SNw6n">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<captionBounds value="0,0,110,28"/>
 					<captionInternalWidth value="-2147483648"/>
 					<captionInternalHeight value="-2147483648"/>
 					<captionVisible value="true"/>
 					<captionSide value="12"/>
 					<properties>
-						<abackground value="Cr:122,207,245,255"/>
-						<aforeground value="Cr:0,0,0,255"/>
-						<azOrder value="9"/>
+						<abackground value="Cr:179,214,249,255"/>
+						<aforeground value="Cr:0,0,0,255"/>
+						<azOrder value="12"/>
 						<acreatorDiagramType value="ClassDiagram"/>
 						<aselectable value="true"/>
 						<arequestResetCaption value="false"/>
@@ -14091,7 +14901,7 @@
 						<ashowOperationsReturnType value="0"/>
 					</properties>
 				</xmi:Extension>
-				<elementFill color1="Cr:122,207,245,255" color2="" style="1" transparency="0" type="1"/>
+				<elementFill color1="Cr:179,214,249,255" color2="" style="1" transparency="0" type="1"/>
 				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
 				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
 			</uml:DiagramElement>
@@ -14131,17 +14941,17 @@
 				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
 				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
 			</uml:DiagramElement>
-			<uml:DiagramElement geometry="700,40,80,40" preferredShapeType="Class" subject="L9xJLuyCiu1SNw61" xmi:id="L9xJLuyCiu1SNw60">
-				<xmi:Extension extender="Visual Paradigm for UML">
-					<captionBounds value="0,0,80,14"/>
+			<uml:DiagramElement geometry="700,40,110,40" preferredShapeType="Class" subject="L9xJLuyCiu1SNw61" xmi:id="L9xJLuyCiu1SNw60">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<captionBounds value="0,0,110,28"/>
 					<captionInternalWidth value="-2147483648"/>
 					<captionInternalHeight value="-2147483648"/>
 					<captionVisible value="true"/>
 					<captionSide value="12"/>
 					<properties>
-						<abackground value="Cr:122,207,245,255"/>
-						<aforeground value="Cr:0,0,0,255"/>
-						<azOrder value="7"/>
+						<abackground value="Cr:179,214,249,255"/>
+						<aforeground value="Cr:0,0,0,255"/>
+						<azOrder value="10"/>
 						<acreatorDiagramType value="ClassDiagram"/>
 						<aselectable value="true"/>
 						<arequestResetCaption value="false"/>
@@ -14192,11 +15002,11 @@
 						<ashowOperationsReturnType value="0"/>
 					</properties>
 				</xmi:Extension>
-				<elementFill color1="Cr:122,207,245,255" color2="" style="1" transparency="0" type="1"/>
-				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
-				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
-			</uml:DiagramElement>
-			<uml:DiagramElement geometry="580,60;699,60;" preferredShapeType="Generalization" subject="ouFJLuyCiu1SNw6_" xmi:id="ouFJLuyCiu1SNw7A">
+				<elementFill color1="Cr:179,214,249,255" color2="" style="1" transparency="0" type="1"/>
+				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
+				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
+			</uml:DiagramElement>
+			<uml:DiagramElement geometry="610,60;699,60;" preferredShapeType="Generalization" subject="ouFJLuyCiu1SNw6_" xmi:id="ouFJLuyCiu1SNw7A">
 				<xmi:Extension extender="Visual Paradigm for UML">
 					<captionBounds value="629,60,20,0"/>
 					<captionInternalWidth value="-2147483648"/>
@@ -14242,7 +15052,7 @@
 					<properties>
 						<abackground value="Cr:192,255,192,255"/>
 						<aforeground value="Cr:0,0,0,255"/>
-						<azOrder value="5"/>
+						<azOrder value="8"/>
 						<aselectable value="true"/>
 						<arequestResetCaption value="false"/>
 						<arequestResetCaptionSize value="false"/>
@@ -14306,7 +15116,7 @@
 					<properties>
 						<abackground value="Cr:122,207,245,255"/>
 						<aforeground value="Cr:0,0,0,255"/>
-						<azOrder value="3"/>
+						<azOrder value="6"/>
 						<acreatorDiagramType value="ClassDiagram"/>
 						<aselectable value="true"/>
 						<arequestResetCaption value="false"/>
@@ -14489,9 +15299,9 @@
 				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
 				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
 			</uml:DiagramElement>
-			<uml:DiagramElement geometry="740,80;740,160;830,160;830,60;780,60;" preferredShapeType="Association" subject="MMoybuyCiu1SNxF6" xmi:id="sMoybuyCiu1SNxF_">
-				<xmi:Extension extender="Visual Paradigm for UML">
-					<captionBounds value="760,170,146,14"/>
+			<uml:DiagramElement geometry="740,80;740,160;670,160;670,70;699,70;" preferredShapeType="Association" subject="MMoybuyCiu1SNxF6" xmi:id="sMoybuyCiu1SNxF_">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<captionBounds value="620,170,67,14"/>
 					<captionInternalWidth value="-2147483648"/>
 					<captionInternalHeight value="-2147483648"/>
 					<captionVisible value="true"/>
@@ -14553,9 +15363,465 @@
 				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
 				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
 			</uml:DiagramElement>
-			<uml:DiagramElement geometry="430,160,160,40" preferredShapeType="Class" subject="YmaybuyCiu1SNxGR" xmi:id="YmaybuyCiu1SNxGQ">
-				<xmi:Extension extender="Visual Paradigm for UML">
-					<captionBounds value="0,0,160,14"/>
+			<uml:DiagramElement geometry="470,160,80,50" preferredShapeType="Class" subject="YmaybuyCiu1SNxGR" xmi:id="YmaybuyCiu1SNxGQ">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<captionBounds value="0,0,80,14"/>
+					<captionInternalWidth value="-2147483648"/>
+					<captionInternalHeight value="-2147483648"/>
+					<captionVisible value="true"/>
+					<captionSide value="12"/>
+					<properties>
+						<abackground value="Cr:192,192,192,255"/>
+						<aforeground value="Cr:0,0,0,255"/>
+						<azOrder value="4"/>
+						<acreatorDiagramType value="ClassDiagram"/>
+						<aselectable value="true"/>
+						<arequestResetCaption value="false"/>
+						<arequestResetCaptionSize value="false"/>
+						<adisplayStereotypeIcon value="false"/>
+						<aoverrideAppearanceWithStereotypeIcon value="true"/>
+						<arequestSetSizeOption value="0"/>
+						<aparentConnectorHeaderLength value="40"/>
+						<aparentConnectorLineLength value="10"/>
+						<aconnectToPoint value="true"/>
+						<aparentConnectorDTheta value="0.0"/>
+						<aconnectionPointType value="2"/>
+						<amodelElementNameAlignment value="9"/>
+						<arequestDefaultSize value="false"/>
+						<arequestFitSize value="false"/>
+						<arequestFitSizeFromCenter value="false"/>
+						<adisplayAsRobustnessAnalysisIcon value="true"/>
+						<avisibilityStyle value="1"/>
+						<ashowAttributeType value="1"/>
+						<ashowOperationType value="1"/>
+						<amSwTpPts value="true"/>
+						<alshRfAts value="true"/>
+						<amShDrAt value="false"/>
+						<akShDrOp value="false"/>
+						<akSwCsMbSt value="true"/>
+						<ashowClassMemberConstraints value="true"/>
+						<alShCmMl value="false"/>
+						<ashowOperationParameterDirection value="false"/>
+						<ashowOperationRaisedExceptions value="false"/>
+						<ashowParameterNameInOperationSignature value="true"/>
+						<ashowOperationTemplateParameters value="false"/>
+						<ashowOperationProperties value="false"/>
+						<awpMbs value="false"/>
+						<aattributeSortType value="0"/>
+						<aoperationSortType value="0"/>
+						<ashowInitialAttributeValue value="true"/>
+						<ashowOperationSignature value="true"/>
+						<ainterfaceBall value="false"/>
+						<ashowEmptyCompartments value="0"/>
+						<ashowEllipsisForUnshownMembers value="0"/>
+						<ashowAttributesCodeDetails value="0"/>
+						<ashowOperationsCodeDetails value="0"/>
+						<ashowParametersCodeDetails value="0"/>
+						<ashowTypeOption value="0"/>
+						<ashowOwnerOption value="3"/>
+						<ashowAttributesType value="0"/>
+						<ashowOperationsParameters value="0"/>
+						<ashowOperationsReturnType value="0"/>
+					</properties>
+				</xmi:Extension>
+				<elementFill color1="Cr:192,192,192,255" color2="" style="1" transparency="0" type="1"/>
+				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
+				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
+			</uml:DiagramElement>
+			<uml:DiagramElement geometry="690,160;690,190;550,190;" preferredShapeType="AssociationClass" subject="fpOybuyCiu1SNxGW" xmi:id="fpOybuyCiu1SNxGX">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<captionBounds value="586,218,20,0"/>
+					<captionInternalWidth value="-2147483648"/>
+					<captionInternalHeight value="-2147483648"/>
+					<captionVisible value="true"/>
+					<captionSide value="1"/>
+					<properties>
+						<abackground value="Cr:122,207,245,255"/>
+						<aforeground value="Cr:0,0,0,255"/>
+						<azOrder value="-1"/>
+						<aselectable value="true"/>
+						<arequestResetCaption value="false"/>
+						<arequestResetCaptionSize value="false"/>
+						<aconnectorStyle value="3"/>
+						<aconnectorLineJumps value="4"/>
+						<aconnectorLabelOrientation value="4"/>
+						<afromShapeXDiff value="0"/>
+						<afromShapeYDiff value="0"/>
+						<atoShapeXDiff value="0"/>
+						<atoShapeYDiff value="0"/>
+						<afromConnectType value="0"/>
+						<atoConnectType value="0"/>
+						<auseFromShapeCenter value="true"/>
+						<auseToShapeCenter value="true"/>
+						<afromPinType value="1"/>
+						<atoPinType value="1"/>
+						<arequestRebuild value="false"/>
+						<ashowConnectorName value="2"/>
+						<apaintThroughLabel value="2"/>
+					</properties>
+				</xmi:Extension>
+				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
+				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
+			</uml:DiagramElement>
+			<uml:DiagramElement geometry="469,180;300,180;" preferredShapeType="Association" subject="QjBybuyCiu1SNxGg" xmi:id="QjBybuyCiu1SNxGl">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<captionBounds value="355,180,20,0"/>
+					<captionInternalWidth value="-2147483648"/>
+					<captionInternalHeight value="-2147483648"/>
+					<captionVisible value="true"/>
+					<captionSide value="1"/>
+					<properties>
+						<abackground value="Cr:122,207,245,255"/>
+						<aforeground value="Cr:0,0,0,255"/>
+						<azOrder value="-1"/>
+						<acreatorDiagramType value="ClassDiagram"/>
+						<aselectable value="true"/>
+						<arequestResetCaption value="false"/>
+						<arequestResetCaptionSize value="false"/>
+						<aconnectorStyle value="3"/>
+						<aconnectorLineJumps value="4"/>
+						<aconnectorLabelOrientation value="4"/>
+						<afromShapeXDiff value="0"/>
+						<afromShapeYDiff value="0"/>
+						<atoShapeXDiff value="0"/>
+						<atoShapeYDiff value="0"/>
+						<afromConnectType value="0"/>
+						<atoConnectType value="0"/>
+						<auseFromShapeCenter value="true"/>
+						<auseToShapeCenter value="true"/>
+						<afromPinType value="1"/>
+						<atoPinType value="1"/>
+						<arequestRebuild value="false"/>
+						<ashowConnectorName value="2"/>
+						<apaintThroughLabel value="2"/>
+						<ahasRoleAShape value="false"/>
+						<ahasRoleBShape value="false"/>
+						<ashowMultiplicityConstraints value="false"/>
+						<ahasMultiplicityAShape value="false"/>
+						<ahasMultiplicityBShape value="false"/>
+						<a0SwDr value="false"/>
+						<ashowStereotypes value="true"/>
+						<ashowFromRoleName value="true"/>
+						<ashowToRoleName value="true"/>
+						<ashowFromMultiplicity value="true"/>
+						<ashowToMultiplicity value="true"/>
+						<ashowFromRoleVisibility value="true"/>
+						<ashowToRoleVisibility value="true"/>
+						<ashowAssociationEndPropertyStrings value="false"/>
+						<ahasAssociationEndPropertyStringsAShape value="false"/>
+						<ahasAssociationEndPropertyStringsBShape value="false"/>
+						<afromRoleInternalWidth value="-2147483648"/>
+						<afromRoleInternalHeight value="-2147483648"/>
+						<atoRoleInternalWidth value="-2147483648"/>
+						<atoRoleInternalHeight value="-2147483648"/>
+						<afromMultiplicityInternalWidth value="-2147483648"/>
+						<afromMultiplicityInternalHeight value="-2147483648"/>
+						<atoMultiplicityInternalWidth value="-2147483648"/>
+						<atoMultiplicityInternalHeight value="-2147483648"/>
+						<aassociationEndPropertyStringsAInternalWidth value="-2147483648"/>
+						<aassociationEndPropertyStringsAInternalHeight value="-2147483648"/>
+						<aassociationEndPropertyStringsBInternalWidth value="-2147483648"/>
+						<aassociationEndPropertyStringsBInternalHeight value="-2147483648"/>
+					</properties>
+				</xmi:Extension>
+				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
+				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
+			</uml:DiagramElement>
+			<uml:DiagramElement geometry="770,80;770,160;830,160;830,60;810,60;" preferredShapeType="Association" subject="m4aBHuyCiu1SNxLY" xmi:id="m4aBHuyCiu1SNxLd">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<captionBounds value="810,170,63,14"/>
+					<captionInternalWidth value="-2147483648"/>
+					<captionInternalHeight value="-2147483648"/>
+					<captionVisible value="true"/>
+					<captionSide value="1"/>
+					<properties>
+						<abackground value="Cr:122,207,245,255"/>
+						<aforeground value="Cr:0,0,0,255"/>
+						<azOrder value="-1"/>
+						<acreatorDiagramType value="ClassDiagram"/>
+						<aselectable value="true"/>
+						<arequestResetCaption value="false"/>
+						<arequestResetCaptionSize value="false"/>
+						<aconnectorStyle value="3"/>
+						<aconnectorLineJumps value="4"/>
+						<aconnectorLabelOrientation value="4"/>
+						<afromShapeXDiff value="0"/>
+						<afromShapeYDiff value="0"/>
+						<atoShapeXDiff value="0"/>
+						<atoShapeYDiff value="0"/>
+						<afromConnectType value="0"/>
+						<atoConnectType value="0"/>
+						<auseFromShapeCenter value="true"/>
+						<auseToShapeCenter value="true"/>
+						<afromPinType value="1"/>
+						<atoPinType value="1"/>
+						<arequestRebuild value="false"/>
+						<ashowConnectorName value="2"/>
+						<apaintThroughLabel value="2"/>
+						<ahasRoleAShape value="false"/>
+						<ahasRoleBShape value="false"/>
+						<ashowMultiplicityConstraints value="false"/>
+						<ahasMultiplicityAShape value="false"/>
+						<ahasMultiplicityBShape value="false"/>
+						<a0SwDr value="false"/>
+						<ashowStereotypes value="true"/>
+						<ashowFromRoleName value="true"/>
+						<ashowToRoleName value="true"/>
+						<ashowFromMultiplicity value="true"/>
+						<ashowToMultiplicity value="true"/>
+						<ashowFromRoleVisibility value="true"/>
+						<ashowToRoleVisibility value="true"/>
+						<ashowAssociationEndPropertyStrings value="false"/>
+						<ahasAssociationEndPropertyStringsAShape value="false"/>
+						<ahasAssociationEndPropertyStringsBShape value="false"/>
+						<afromRoleInternalWidth value="-2147483648"/>
+						<afromRoleInternalHeight value="-2147483648"/>
+						<atoRoleInternalWidth value="-2147483648"/>
+						<atoRoleInternalHeight value="-2147483648"/>
+						<afromMultiplicityInternalWidth value="-2147483648"/>
+						<afromMultiplicityInternalHeight value="-2147483648"/>
+						<atoMultiplicityInternalWidth value="-2147483648"/>
+						<atoMultiplicityInternalHeight value="-2147483648"/>
+						<aassociationEndPropertyStringsAInternalWidth value="-2147483648"/>
+						<aassociationEndPropertyStringsAInternalHeight value="-2147483648"/>
+						<aassociationEndPropertyStringsBInternalWidth value="-2147483648"/>
+						<aassociationEndPropertyStringsBInternalHeight value="-2147483648"/>
+					</properties>
+				</xmi:Extension>
+				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
+				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
+			</uml:DiagramElement>
+			<uml:DiagramElement geometry="470,340,80,50" preferredShapeType="Class" subject="Oa6BHuyCiu1SNxLh" xmi:id="Oa6BHuyCiu1SNxLg">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<captionBounds value="0,0,80,14"/>
+					<captionInternalWidth value="-2147483648"/>
+					<captionInternalHeight value="-2147483648"/>
+					<captionVisible value="true"/>
+					<captionSide value="12"/>
+					<properties>
+						<abackground value="Cr:192,192,192,255"/>
+						<aforeground value="Cr:0,0,0,255"/>
+						<azOrder value="2"/>
+						<acreatorDiagramType value="ClassDiagram"/>
+						<aselectable value="true"/>
+						<arequestResetCaption value="false"/>
+						<arequestResetCaptionSize value="false"/>
+						<adisplayStereotypeIcon value="false"/>
+						<aoverrideAppearanceWithStereotypeIcon value="true"/>
+						<arequestSetSizeOption value="0"/>
+						<aparentConnectorHeaderLength value="40"/>
+						<aparentConnectorLineLength value="10"/>
+						<aconnectToPoint value="true"/>
+						<aparentConnectorDTheta value="0.0"/>
+						<aconnectionPointType value="2"/>
+						<amodelElementNameAlignment value="9"/>
+						<arequestDefaultSize value="false"/>
+						<arequestFitSize value="false"/>
+						<arequestFitSizeFromCenter value="false"/>
+						<adisplayAsRobustnessAnalysisIcon value="true"/>
+						<avisibilityStyle value="1"/>
+						<ashowAttributeType value="1"/>
+						<ashowOperationType value="1"/>
+						<amSwTpPts value="true"/>
+						<alshRfAts value="true"/>
+						<amShDrAt value="false"/>
+						<akShDrOp value="false"/>
+						<akSwCsMbSt value="true"/>
+						<ashowClassMemberConstraints value="true"/>
+						<alShCmMl value="false"/>
+						<ashowOperationParameterDirection value="false"/>
+						<ashowOperationRaisedExceptions value="false"/>
+						<ashowParameterNameInOperationSignature value="true"/>
+						<ashowOperationTemplateParameters value="false"/>
+						<ashowOperationProperties value="false"/>
+						<awpMbs value="false"/>
+						<aattributeSortType value="0"/>
+						<aoperationSortType value="0"/>
+						<ashowInitialAttributeValue value="true"/>
+						<ashowOperationSignature value="true"/>
+						<ainterfaceBall value="false"/>
+						<ashowEmptyCompartments value="0"/>
+						<ashowEllipsisForUnshownMembers value="0"/>
+						<ashowAttributesCodeDetails value="0"/>
+						<ashowOperationsCodeDetails value="0"/>
+						<ashowParametersCodeDetails value="0"/>
+						<ashowTypeOption value="0"/>
+						<ashowOwnerOption value="3"/>
+						<ashowAttributesType value="0"/>
+						<ashowOperationsParameters value="0"/>
+						<ashowOperationsReturnType value="0"/>
+					</properties>
+				</xmi:Extension>
+				<elementFill color1="Cr:192,192,192,255" color2="" style="1" transparency="0" type="1"/>
+				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
+				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
+			</uml:DiagramElement>
+			<uml:DiagramElement geometry="810,160;810,360;550,360;" preferredShapeType="AssociationClass" subject="Lu.BHuyCiu1SNxLr" xmi:id="ru.BHuyCiu1SNxLs">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<captionBounds value="809,381,20,0"/>
+					<captionInternalWidth value="-2147483648"/>
+					<captionInternalHeight value="-2147483648"/>
+					<captionVisible value="true"/>
+					<captionSide value="1"/>
+					<properties>
+						<abackground value="Cr:122,207,245,255"/>
+						<aforeground value="Cr:0,0,0,255"/>
+						<azOrder value="-1"/>
+						<aselectable value="true"/>
+						<arequestResetCaption value="false"/>
+						<arequestResetCaptionSize value="false"/>
+						<aconnectorStyle value="3"/>
+						<aconnectorLineJumps value="4"/>
+						<aconnectorLabelOrientation value="4"/>
+						<afromShapeXDiff value="0"/>
+						<afromShapeYDiff value="0"/>
+						<atoShapeXDiff value="0"/>
+						<atoShapeYDiff value="0"/>
+						<afromConnectType value="0"/>
+						<atoConnectType value="0"/>
+						<auseFromShapeCenter value="true"/>
+						<auseToShapeCenter value="true"/>
+						<afromPinType value="1"/>
+						<atoPinType value="1"/>
+						<arequestRebuild value="false"/>
+						<ashowConnectorName value="2"/>
+						<apaintThroughLabel value="2"/>
+					</properties>
+				</xmi:Extension>
+				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
+				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
+			</uml:DiagramElement>
+			<uml:DiagramElement geometry="469,360;140,360;140,80;" preferredShapeType="Association" subject="ghXBHuyCiu1SNxMM" xmi:id="IhXBHuyCiu1SNxMR">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<captionBounds value="134,359,20,0"/>
+					<captionInternalWidth value="-2147483648"/>
+					<captionInternalHeight value="-2147483648"/>
+					<captionVisible value="true"/>
+					<captionSide value="1"/>
+					<properties>
+						<abackground value="Cr:122,207,245,255"/>
+						<aforeground value="Cr:0,0,0,255"/>
+						<azOrder value="-1"/>
+						<acreatorDiagramType value="ClassDiagram"/>
+						<aselectable value="true"/>
+						<arequestResetCaption value="false"/>
+						<arequestResetCaptionSize value="false"/>
+						<aconnectorStyle value="3"/>
+						<aconnectorLineJumps value="4"/>
+						<aconnectorLabelOrientation value="4"/>
+						<afromShapeXDiff value="0"/>
+						<afromShapeYDiff value="0"/>
+						<atoShapeXDiff value="0"/>
+						<atoShapeYDiff value="0"/>
+						<afromConnectType value="0"/>
+						<atoConnectType value="0"/>
+						<auseFromShapeCenter value="true"/>
+						<auseToShapeCenter value="true"/>
+						<afromPinType value="1"/>
+						<atoPinType value="1"/>
+						<arequestRebuild value="false"/>
+						<ashowConnectorName value="2"/>
+						<apaintThroughLabel value="2"/>
+						<ahasRoleAShape value="false"/>
+						<ahasRoleBShape value="false"/>
+						<ashowMultiplicityConstraints value="false"/>
+						<ahasMultiplicityAShape value="false"/>
+						<ahasMultiplicityBShape value="false"/>
+						<a0SwDr value="false"/>
+						<ashowStereotypes value="true"/>
+						<ashowFromRoleName value="true"/>
+						<ashowToRoleName value="true"/>
+						<ashowFromMultiplicity value="true"/>
+						<ashowToMultiplicity value="true"/>
+						<ashowFromRoleVisibility value="true"/>
+						<ashowToRoleVisibility value="true"/>
+						<ashowAssociationEndPropertyStrings value="false"/>
+						<ahasAssociationEndPropertyStringsAShape value="false"/>
+						<ahasAssociationEndPropertyStringsBShape value="false"/>
+						<afromRoleInternalWidth value="-2147483648"/>
+						<afromRoleInternalHeight value="-2147483648"/>
+						<atoRoleInternalWidth value="-2147483648"/>
+						<atoRoleInternalHeight value="-2147483648"/>
+						<afromMultiplicityInternalWidth value="-2147483648"/>
+						<afromMultiplicityInternalHeight value="-2147483648"/>
+						<atoMultiplicityInternalWidth value="-2147483648"/>
+						<atoMultiplicityInternalHeight value="-2147483648"/>
+						<aassociationEndPropertyStringsAInternalWidth value="-2147483648"/>
+						<aassociationEndPropertyStringsAInternalHeight value="-2147483648"/>
+						<aassociationEndPropertyStringsBInternalWidth value="-2147483648"/>
+						<aassociationEndPropertyStringsBInternalHeight value="-2147483648"/>
+					</properties>
+				</xmi:Extension>
+				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
+				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
+			</uml:DiagramElement>
+			<uml:DiagramElement geometry="260,200;260,230;750,230;750,80;" preferredShapeType="Association" subject="SA4hHuyCiu1SNxMa" xmi:id="KA4hHuyCiu1SNxMf">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<captionBounds value="290,230,77,14"/>
+					<captionInternalWidth value="-2147483648"/>
+					<captionInternalHeight value="-2147483648"/>
+					<captionVisible value="true"/>
+					<captionSide value="1"/>
+					<properties>
+						<abackground value="Cr:122,207,245,255"/>
+						<aforeground value="Cr:0,0,0,255"/>
+						<azOrder value="-1"/>
+						<acreatorDiagramType value="ClassDiagram"/>
+						<aselectable value="true"/>
+						<arequestResetCaption value="false"/>
+						<arequestResetCaptionSize value="false"/>
+						<aconnectorStyle value="3"/>
+						<aconnectorLineJumps value="4"/>
+						<aconnectorLabelOrientation value="4"/>
+						<afromShapeXDiff value="0"/>
+						<afromShapeYDiff value="0"/>
+						<atoShapeXDiff value="0"/>
+						<atoShapeYDiff value="0"/>
+						<afromConnectType value="0"/>
+						<atoConnectType value="0"/>
+						<auseFromShapeCenter value="true"/>
+						<auseToShapeCenter value="true"/>
+						<afromPinType value="1"/>
+						<atoPinType value="1"/>
+						<arequestRebuild value="false"/>
+						<ashowConnectorName value="2"/>
+						<apaintThroughLabel value="2"/>
+						<ahasRoleAShape value="false"/>
+						<ahasRoleBShape value="false"/>
+						<ashowMultiplicityConstraints value="false"/>
+						<ahasMultiplicityAShape value="false"/>
+						<ahasMultiplicityBShape value="false"/>
+						<a0SwDr value="false"/>
+						<ashowStereotypes value="true"/>
+						<ashowFromRoleName value="true"/>
+						<ashowToRoleName value="true"/>
+						<ashowFromMultiplicity value="true"/>
+						<ashowToMultiplicity value="true"/>
+						<ashowFromRoleVisibility value="true"/>
+						<ashowToRoleVisibility value="true"/>
+						<ashowAssociationEndPropertyStrings value="false"/>
+						<ahasAssociationEndPropertyStringsAShape value="false"/>
+						<ahasAssociationEndPropertyStringsBShape value="false"/>
+						<afromRoleInternalWidth value="-2147483648"/>
+						<afromRoleInternalHeight value="-2147483648"/>
+						<atoRoleInternalWidth value="-2147483648"/>
+						<atoRoleInternalHeight value="-2147483648"/>
+						<afromMultiplicityInternalWidth value="-2147483648"/>
+						<afromMultiplicityInternalHeight value="-2147483648"/>
+						<atoMultiplicityInternalWidth value="-2147483648"/>
+						<atoMultiplicityInternalHeight value="-2147483648"/>
+						<aassociationEndPropertyStringsAInternalWidth value="-2147483648"/>
+						<aassociationEndPropertyStringsAInternalHeight value="-2147483648"/>
+						<aassociationEndPropertyStringsBInternalWidth value="-2147483648"/>
+						<aassociationEndPropertyStringsBInternalHeight value="-2147483648"/>
+					</properties>
+				</xmi:Extension>
+				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
+				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
+			</uml:DiagramElement>
+			<uml:DiagramElement geometry="470,260,80,50" preferredShapeType="Class" subject="ThihHuyCiu1SNxMu" xmi:id="ThihHuyCiu1SNxMt">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<captionBounds value="0,0,80,14"/>
 					<captionInternalWidth value="-2147483648"/>
 					<captionInternalHeight value="-2147483648"/>
 					<captionVisible value="true"/>
@@ -14618,100 +15884,36 @@
 				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
 				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
 			</uml:DiagramElement>
-			<uml:DiagramElement geometry="750,160;750,190;590,190;" preferredShapeType="AssociationClass" subject="fpOybuyCiu1SNxGW" xmi:id="fpOybuyCiu1SNxGX">
-				<xmi:Extension extender="Visual Paradigm for UML">
-					<captionBounds value="671,218,20,0"/>
-					<captionInternalWidth value="-2147483648"/>
-					<captionInternalHeight value="-2147483648"/>
-					<captionVisible value="true"/>
-					<captionSide value="1"/>
-					<properties>
-						<abackground value="Cr:122,207,245,255"/>
-						<aforeground value="Cr:0,0,0,255"/>
-						<azOrder value="-1"/>
-						<aselectable value="true"/>
-						<arequestResetCaption value="false"/>
-						<arequestResetCaptionSize value="false"/>
-						<aconnectorStyle value="3"/>
-						<aconnectorLineJumps value="4"/>
-						<aconnectorLabelOrientation value="4"/>
-						<afromShapeXDiff value="0"/>
-						<afromShapeYDiff value="0"/>
-						<atoShapeXDiff value="0"/>
-						<atoShapeYDiff value="0"/>
-						<afromConnectType value="0"/>
-						<atoConnectType value="0"/>
-						<auseFromShapeCenter value="true"/>
-						<auseToShapeCenter value="true"/>
-						<afromPinType value="1"/>
-						<atoPinType value="1"/>
-						<arequestRebuild value="false"/>
-						<ashowConnectorName value="2"/>
-						<apaintThroughLabel value="2"/>
-					</properties>
-				</xmi:Extension>
-				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
-				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
-			</uml:DiagramElement>
-			<uml:DiagramElement geometry="429,180;300,180;" preferredShapeType="Association" subject="QjBybuyCiu1SNxGg" xmi:id="QjBybuyCiu1SNxGl">
-				<xmi:Extension extender="Visual Paradigm for UML">
-					<captionBounds value="355,180,20,0"/>
-					<captionInternalWidth value="-2147483648"/>
-					<captionInternalHeight value="-2147483648"/>
-					<captionVisible value="true"/>
-					<captionSide value="1"/>
-					<properties>
-						<abackground value="Cr:122,207,245,255"/>
-						<aforeground value="Cr:0,0,0,255"/>
-						<azOrder value="-1"/>
-						<acreatorDiagramType value="ClassDiagram"/>
-						<aselectable value="true"/>
-						<arequestResetCaption value="false"/>
-						<arequestResetCaptionSize value="false"/>
-						<aconnectorStyle value="3"/>
-						<aconnectorLineJumps value="4"/>
-						<aconnectorLabelOrientation value="4"/>
-						<afromShapeXDiff value="0"/>
-						<afromShapeYDiff value="0"/>
-						<atoShapeXDiff value="0"/>
-						<atoShapeYDiff value="0"/>
-						<afromConnectType value="0"/>
-						<atoConnectType value="0"/>
-						<auseFromShapeCenter value="true"/>
-						<auseToShapeCenter value="true"/>
-						<afromPinType value="1"/>
-						<atoPinType value="1"/>
-						<arequestRebuild value="false"/>
-						<ashowConnectorName value="2"/>
-						<apaintThroughLabel value="2"/>
-						<ahasRoleAShape value="false"/>
-						<ahasRoleBShape value="false"/>
-						<ashowMultiplicityConstraints value="false"/>
-						<ahasMultiplicityAShape value="false"/>
-						<ahasMultiplicityBShape value="false"/>
-						<a0SwDr value="false"/>
-						<ashowStereotypes value="true"/>
-						<ashowFromRoleName value="true"/>
-						<ashowToRoleName value="true"/>
-						<ashowFromMultiplicity value="true"/>
-						<ashowToMultiplicity value="true"/>
-						<ashowFromRoleVisibility value="true"/>
-						<ashowToRoleVisibility value="true"/>
-						<ashowAssociationEndPropertyStrings value="false"/>
-						<ahasAssociationEndPropertyStringsAShape value="false"/>
-						<ahasAssociationEndPropertyStringsBShape value="false"/>
-						<afromRoleInternalWidth value="-2147483648"/>
-						<afromRoleInternalHeight value="-2147483648"/>
-						<atoRoleInternalWidth value="-2147483648"/>
-						<atoRoleInternalHeight value="-2147483648"/>
-						<afromMultiplicityInternalWidth value="-2147483648"/>
-						<afromMultiplicityInternalHeight value="-2147483648"/>
-						<atoMultiplicityInternalWidth value="-2147483648"/>
-						<atoMultiplicityInternalHeight value="-2147483648"/>
-						<aassociationEndPropertyStringsAInternalWidth value="-2147483648"/>
-						<aassociationEndPropertyStringsAInternalHeight value="-2147483648"/>
-						<aassociationEndPropertyStringsBInternalWidth value="-2147483648"/>
-						<aassociationEndPropertyStringsBInternalHeight value="-2147483648"/>
+			<uml:DiagramElement geometry="510,230;510,259;" preferredShapeType="AssociationClass" subject="XpGhHuyCiu1SNxM0" xmi:id="XpGhHuyCiu1SNxM1">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<captionBounds value="520,264,20,0"/>
+					<captionInternalWidth value="-2147483648"/>
+					<captionInternalHeight value="-2147483648"/>
+					<captionVisible value="true"/>
+					<captionSide value="1"/>
+					<properties>
+						<abackground value="Cr:122,207,245,255"/>
+						<aforeground value="Cr:0,0,0,255"/>
+						<azOrder value="-1"/>
+						<aselectable value="true"/>
+						<arequestResetCaption value="false"/>
+						<arequestResetCaptionSize value="false"/>
+						<aconnectorStyle value="3"/>
+						<aconnectorLineJumps value="4"/>
+						<aconnectorLabelOrientation value="4"/>
+						<afromShapeXDiff value="0"/>
+						<afromShapeYDiff value="0"/>
+						<atoShapeXDiff value="0"/>
+						<atoShapeYDiff value="0"/>
+						<afromConnectType value="0"/>
+						<atoConnectType value="0"/>
+						<auseFromShapeCenter value="true"/>
+						<auseToShapeCenter value="true"/>
+						<afromPinType value="1"/>
+						<atoPinType value="1"/>
+						<arequestRebuild value="false"/>
+						<ashowConnectorName value="2"/>
+						<apaintThroughLabel value="2"/>
 					</properties>
 				</xmi:Extension>
 				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
@@ -14724,7 +15926,7 @@
 			<properties>
 				<apmAuthor value="lavm"/>
 				<apmCreateDateTime value="1337717549249"/>
-				<apmLastModified value="1337717578939"/>
+				<apmLastModified value="1337805933734"/>
 				<ashowPackageNameStyle value="0"/>
 				<ashowConnectorName value="0"/>
 				<apaintConnectorThroughLabel value="0"/>
Binary file model/uml/component2.png has changed
--- a/model/uml/component2.svg	Thu May 24 21:48:41 2012 -0400
+++ b/model/uml/component2.svg	Thu May 24 21:51:11 2012 -0400
@@ -24,10 +24,10 @@
       ><path d="M0 0 L80 0 L80 14 L0 14 L0 0 Z"
       /></clipPath
       ><clipPath clipPathUnits="userSpaceOnUse" id="clipPath7"
-      ><path d="M-7 -7 L91 -7 L91 91 L-7 91 L-7 -7 Z"
+      ><path d="M-7 -7 L91 -7 L91 89 L-7 89 L-7 -7 Z"
       /></clipPath
       ><clipPath clipPathUnits="userSpaceOnUse" id="clipPath8"
-      ><path d="M0 0 L0 77 L80 77 L80 0 Z"
+      ><path d="M0 0 L0 75 L80 75 L80 0 Z"
       /></clipPath
       ><clipPath clipPathUnits="userSpaceOnUse" id="clipPath9"
       ><path d="M-7 -7 L141 -7 L141 61 L-7 61 L-7 -7 Z"
@@ -84,7 +84,7 @@
       ><path d="M0 0 L104 0 L104 143 L0 143 L0 0 Z"
       /></clipPath
       ><clipPath clipPathUnits="userSpaceOnUse" id="clipPath27"
-      ><path d="M0 0 L336 0 L336 162 L0 162 L0 0 Z"
+      ><path d="M0 0 L336 0 L336 164 L0 164 L0 0 Z"
       /></clipPath
       ><clipPath clipPathUnits="userSpaceOnUse" id="clipPath28"
       ><path d="M0 0 L104 0 L104 213 L0 213 L0 0 Z"
@@ -144,10 +144,10 @@
       >Agent</text
     ></g
     ><g font-size="11" transform="translate(135,46)" 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="80" y="0" clip-path="url(#clipPath7)" stroke="none"
+    ><rect x="0" width="80" height="78" y="0" clip-path="url(#clipPath7)" stroke="none"
     /></g
     ><g font-size="11" stroke-linecap="butt" transform="translate(135,46)" 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="80" y="0" clip-path="url(#clipPath7)"
+    ><rect fill="none" x="0" width="80" height="78" y="0" clip-path="url(#clipPath7)"
       /><line y2="14" fill="none" x1="0" clip-path="url(#clipPath7)" x2="80" y1="14"
     /></g
     ><g font-size="11" transform="translate(135,60)" fill-opacity="1" fill="black" text-rendering="geometricPrecision" font-family="sans-serif" stroke="black" stroke-opacity="1"
@@ -330,9 +330,9 @@
     ><g font-size="11" stroke-linecap="butt" transform="translate(396,86)" 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="89" fill="none" x1="50" clip-path="url(#clipPath26)" x2="50" y1="50"
     /></g
-    ><g font-size="11" stroke-linecap="butt" transform="translate(124,76)" fill-opacity="1" fill="black" text-rendering="geometricPrecision" font-family="sans-serif" stroke-linejoin="round" stroke="black" stroke-opacity="1"
-    ><line y2="108" fill="none" x1="282" clip-path="url(#clipPath27)" x2="50" y1="108"
-      /><line y2="50" fill="none" x1="50" clip-path="url(#clipPath27)" x2="50" y1="108"
+    ><g font-size="11" stroke-linecap="butt" transform="translate(124,74)" fill-opacity="1" fill="black" text-rendering="geometricPrecision" font-family="sans-serif" stroke-linejoin="round" stroke="black" stroke-opacity="1"
+    ><line y2="110" fill="none" x1="282" clip-path="url(#clipPath27)" x2="50" y1="110"
+      /><line y2="50" fill="none" x1="50" clip-path="url(#clipPath27)" x2="50" y1="110"
       /><line y2="62" fill="none" x1="50" clip-path="url(#clipPath27)" x2="44" y1="50"
       /><line y2="62" fill="none" x1="50" clip-path="url(#clipPath27)" x2="56" y1="50"
     /></g
--- a/model/uml/component2.xmi	Thu May 24 21:48:41 2012 -0400
+++ b/model/uml/component2.xmi	Thu May 24 21:51:11 2012 -0400
@@ -5170,7 +5170,7 @@
 								<property htmlValue="" name="documentation" type="htmlString" value=""/>
 								<property name="pmAuthor" type="string" value="lavm"/>
 								<property name="pmCreateDateTime" type="string" value="1337241303538"/>
-								<property name="pmLastModified" type="string" value="1337719681272"/>
+								<property name="pmLastModified" type="string" value="1337875861982"/>
 								<property name="qualityScore" type="int" value="-1"/>
 							</properties>
 							<vpumlChildModelRefs>
@@ -5197,7 +5197,6 @@
 								<modelRef value="Uf5tBuyCiu1SNwgY"/>
 								<modelRef value="CNrtBuyCiu1SNwgz"/>
 								<modelRef value="CqftBuyCiu1SNwhD"/>
-								<modelRef value="vVSGjuyCiu1SNwm4"/>
 								<modelRef value="fOWGjuyCiu1SNwnM"/>
 								<modelRef value="t7OGjuyCiu1SNwnU"/>
 								<modelRef value="1YFGjuyCiu1SNwnk"/>
@@ -5216,6 +5215,12 @@
 								<modelRef value="gCsSbuyCiu1SNxFe"/>
 								<modelRef value="MMoybuyCiu1SNxF6"/>
 								<modelRef value="QjBybuyCiu1SNxGg"/>
+								<modelRef value="m4aBHuyCiu1SNxLY"/>
+								<modelRef value="ghXBHuyCiu1SNxMM"/>
+								<modelRef value="SA4hHuyCiu1SNxMa"/>
+								<modelRef value="pKq8nuyCiu1SNxPl"/>
+								<modelRef value="eWBu3uyCiu1SNxXO"/>
+								<modelRef value="1MC5_uyCiu1SNxbJ"/>
 							</vpumlChildModelRefs>
 						</vpumlModel>
 						<vpumlModel id="Bu5UWuyEwTiAAgSF" modelType="ModelRelationshipContainer">
@@ -5225,7 +5230,7 @@
 								<property htmlValue="" name="documentation" type="htmlString" value=""/>
 								<property name="pmAuthor" type="string" value="lavm"/>
 								<property name="pmCreateDateTime" type="string" value="1337247561568"/>
-								<property name="pmLastModified" type="string" value="1337719681274"/>
+								<property name="pmLastModified" type="string" value="1337769103088"/>
 								<property name="qualityScore" type="int" value="-1"/>
 							</properties>
 							<vpumlChildModelRefs>
@@ -5244,6 +5249,9 @@
 								<modelRef value="FMPxzuyCiu1SNw08"/>
 								<modelRef value="eyqRLuyCiu1SNw4b"/>
 								<modelRef value="fpOybuyCiu1SNxGW"/>
+								<modelRef value="Lu.BHuyCiu1SNxLr"/>
+								<modelRef value="XpGhHuyCiu1SNxM0"/>
+								<modelRef value="P7f8nuyCiu1SNxQU"/>
 							</vpumlChildModelRefs>
 						</vpumlModel>
 						<vpumlModel id="XhLbWuyEwTiAAgjM" modelType="ModelRelationshipContainer">
@@ -5253,7 +5261,7 @@
 								<property htmlValue="" name="documentation" type="htmlString" value=""/>
 								<property name="pmAuthor" type="string" value="lavm"/>
 								<property name="pmCreateDateTime" type="string" value="1337259149434"/>
-								<property name="pmLastModified" type="string" value="1337690593801"/>
+								<property name="pmLastModified" type="string" value="1337805539425"/>
 								<property name="qualityScore" type="int" value="-1"/>
 							</properties>
 							<vpumlChildModelRefs>
@@ -5264,6 +5272,9 @@
 								<modelRef value="gt_hLuyCiu1SNw4A"/>
 								<modelRef value="3iRJLuyCiu1SNw6t"/>
 								<modelRef value="ouFJLuyCiu1SNw6_"/>
+								<modelRef value="BHNW3uyCiu1SNxT2"/>
+								<modelRef value="tJTW3uyCiu1SNxT."/>
+								<modelRef value="oCw23uyCiu1SNxUT"/>
 							</vpumlChildModelRefs>
 						</vpumlModel>
 						<vpumlModel id="Ul4OHuyCiu1SNxIB" modelType="ModelRelationshipContainer">
@@ -5294,7 +5305,7 @@
 								</ownedMember>
 								<ownedMember from="afB2HuyCiu1SNxHe" to="yr2uHuyCiu1SNxJW" xmi:id="qlVuHuyCiu1SNxJg" xmi:type="anchor">
 									<xmi:Extension extender="Visual Paradigm for UML">
-										<qualityScore value="-1"/>
+										<qualityScore value="100"/>
 									</xmi:Extension>
 								</ownedMember>
 							</vpumlChildModels>
@@ -6008,7 +6019,7 @@
 						</taggedValue>
 					</xmi:Extension>
 				</association>
-				<associationClass from="f1p0WuyEwTiAAgTE" to="_i1UWuyEwTiAAgSK" xmi:id="9G50WuyEwTiAAgTM"/>
+				<associationClass from="f1p0WuyEwTiAAgTE" name="" to="_i1UWuyEwTiAAgSK" xmi:id="9G50WuyEwTiAAgTM"/>
 				<businessModel xmi:value="false"/>
 				<qualityScore value="92"/>
 				<qualityReason value="1&#9;1&#10;2&#9;2"/>
@@ -6372,7 +6383,8 @@
 								<qualityScore value="-1"/>
 							</xmi:Extension>
 						</qualifier>
-						<qualityScore value="-1"/>
+						<qualityScore value="95"/>
+						<qualityReason value="1&#9;1"/>
 					</xmi:Extension>
 				</ownedAttribute>
 				<ownedAttribute aggregation="none" association="iwsbWuyEwTiAAgiT" isDerived="false" type="m6xjmuyEwTiAAgLk" xmi:id="H7xbWuyEwTiAAgi3" xmi:type="uml:Property">
@@ -6466,6 +6478,30 @@
 						<qualityReason value="1&#9;1"/>
 					</xmi:Extension>
 				</ownedAttribute>
+				<ownedAttribute aggregation="none" association="Ftn8nuyCiu1SNxQP" isDerived="false" type="m6xjmuyEwTiAAgLk" xmi:id="VKq8nuyCiu1SNxPo" xmi:type="uml:Property">
+					<xmi:Extension extender="Visual Paradigm for UML">
+						<associationEnd/>
+						<qualifier name="" xmi:id="VKq8nuyCiu1SNxPp" xmi:type="qualifier">
+							<xmi:Extension extender="Visual Paradigm for UML">
+								<qualityScore value="-1"/>
+							</xmi:Extension>
+						</qualifier>
+						<qualityScore value="95"/>
+						<qualityReason value="1&#9;1"/>
+					</xmi:Extension>
+				</ownedAttribute>
+				<ownedAttribute aggregation="none" association="Ftn8nuyCiu1SNxQP" isDerived="false" isNavigable="true" type="m6xjmuyEwTiAAgLk" xmi:id="pKq8nuyCiu1SNxPm" xmi:type="uml:Property">
+					<xmi:Extension extender="Visual Paradigm for UML">
+						<associationEnd/>
+						<qualifier name="" xmi:id="VKq8nuyCiu1SNxPn" xmi:type="qualifier">
+							<xmi:Extension extender="Visual Paradigm for UML">
+								<qualityScore value="-1"/>
+							</xmi:Extension>
+						</qualifier>
+						<qualityScore value="95"/>
+						<qualityReason value="1&#9;1"/>
+					</xmi:Extension>
+				</ownedAttribute>
 			</ownedMember>
 			<ownedMember isAbstract="false" isActive="false" isLeaf="false" name="Activity" visibility="public" xmi:id="vTljmuyEwTiAAgLp" xmi:type="uml:Class">
 				<xmi:Extension extender="Visual Paradigm for UML">
@@ -6484,15 +6520,12 @@
 					</xmi:Extension>
 					<lowerValue value="1" xmi:id="G3u4WuyEwTiAAgPd_multiplicity_lowerValue" xmi:type="uml:LiteralString"/>
 				</ownedAttribute>
-				<ownedAttribute aggregation="none" isDerived="false" name="startTime" ownerScope="instance" xmi:id="fa44WuyEwTiAAgPN" xmi:type="uml:Property">
+				<ownedAttribute aggregation="none" isDerived="false" name="startTime" ownerScope="instance" xmi:id="xhK1_uyCiu1SNxcP" xmi:type="uml:Property">
 					<xmi:Extension extender="Visual Paradigm for UML">
 						<attribute/>
 						<isVisble xmi:value="true"/>
-						<qualityScore value="97"/>
-						<qualityReason value="2&#9;2"/>
-					</xmi:Extension>
-					<lowerValue value="0" xmi:id="fa44WuyEwTiAAgPN_multiplicity_lowerValue" xmi:type="uml:LiteralString"/>
-					<upperValue value="1" xmi:id="fa44WuyEwTiAAgPN_multiplicity_upperValue" xmi:type="uml:LiteralString"/>
+						<qualityScore value="-1"/>
+					</xmi:Extension>
 				</ownedAttribute>
 				<ownedAttribute aggregation="none" isDerived="false" name="endTime" ownerScope="instance" xmi:id="mJi4WuyEwTiAAgPP" xmi:type="uml:Property">
 					<xmi:Extension extender="Visual Paradigm for UML">
@@ -6604,9 +6637,9 @@
 					</xmi:Extension>
 				</ownedAttribute>
 			</ownedMember>
-			<ownedComment body="Classes and associations&#10;within this rectangle belong to PROV core" name="" xmi:id="afB2HuyCiu1SNxHe" xmi:type="uml:Comment">
-				<xmi:Extension extender="Visual Paradigm for UML">
-					<htmlValue value="&lt;head&gt;&#10;    &lt;style type=&quot;text/css&quot;&gt;&#10;      &lt;!--&#10;        body { color: #000000; font-family: Dialog; font-size: 11px }&#10;      --&gt;&#10;    &lt;/style&gt;&#10;    &#10;  &lt;/head&gt;&#10;  &lt;body&gt;&#10;    &lt;p&gt;&#10;      Classes and associations&#10;    &lt;/p&gt;&#10;    &lt;p&gt;&#10;      within this rectangle belong to PROV core&#10;    &lt;/p&gt;&#10;  &lt;/body&gt;"/>
+			<ownedComment body="Classes and associations&#10;within this area belong to PROV core" name="" xmi:id="afB2HuyCiu1SNxHe" xmi:type="uml:Comment">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<htmlValue value="&lt;head&gt;&#10;    &lt;style type=&quot;text/css&quot;&gt;&#10;      &lt;!--&#10;        body { color: #000000; font-family: Dialog; font-size: 11px }&#10;      --&gt;&#10;    &lt;/style&gt;&#10;    &#10;  &lt;/head&gt;&#10;  &lt;body&gt;&#10;    &lt;p&gt;&#10;      Classes and associations&#10;    &lt;/p&gt;&#10;    &lt;p&gt;&#10;      within this area belong to PROV core&#10;    &lt;/p&gt;&#10;  &lt;/body&gt;"/>
 					<type value="NOTE"/>
 					<qualityScore value="100"/>
 				</xmi:Extension>
@@ -6623,8 +6656,8 @@
 							<property htmlValue="" name="documentation" type="htmlString" value=""/>
 							<property name="pmAuthor" type="string" value="lavm"/>
 							<property name="pmCreateDateTime" type="string" value="1337755811155"/>
-							<property name="pmLastModified" type="string" value="1337755909232"/>
-							<property name="qualityScore" type="int" value="-1"/>
+							<property name="pmLastModified" type="string" value="1337756066660"/>
+							<property name="qualityScore" type="int" value="100"/>
 						</properties>
 					</vpumlModel>
 				</vpumlChildModels>
@@ -6670,6 +6703,7 @@
 					<businessModel xmi:value="false"/>
 					<qualityScore value="97"/>
 					<qualityReason value="2&#9;2"/>
+					<appliedStereotype xmi:value="Class_prov:type_id"/>
 				</xmi:Extension>
 				<memberEnd xmi:idref="77xbWuyEwTiAAgi1"/>
 				<memberEnd xmi:idref="H7xbWuyEwTiAAgi3"/>
@@ -6688,6 +6722,7 @@
 					<businessModel xmi:value="false"/>
 					<qualityScore value="97"/>
 					<qualityReason value="2&#9;2"/>
+					<appliedStereotype xmi:value="Class_prov:type_id"/>
 				</xmi:Extension>
 				<memberEnd xmi:idref="gi8U.uyCiu1SNwYn"/>
 				<memberEnd xmi:idref="gi8U.uyCiu1SNwYp"/>
@@ -6706,6 +6741,7 @@
 					<businessModel xmi:value="false"/>
 					<qualityScore value="97"/>
 					<qualityReason value="2&#9;2"/>
+					<appliedStereotype xmi:value="Class_prov:type_id"/>
 				</xmi:Extension>
 				<memberEnd xmi:idref="D2RU.uyCiu1SNwZB"/>
 				<memberEnd xmi:idref="D2RU.uyCiu1SNwZD"/>
@@ -6715,6 +6751,19 @@
 					</xmi:Extension>
 				</generalization>
 			</ownedMember>
+			<ownedMember isAbstract="false" isActive="false" isLeaf="false" name="tracedTo" visibility="public" xmi:id="Ftn8nuyCiu1SNxQP" xmi:type="uml:AssociationClass">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<isRoot xmi:value="false"/>
+					<modelType value="Class"/>
+					<association isAbstract="false" isDerived="false" isLeaf="false" name="tracedTo" xmi:id="pKq8nuyCiu1SNxPl"/>
+					<associationClass from="pKq8nuyCiu1SNxPl" to="Ftn8nuyCiu1SNxQP" xmi:id="P7f8nuyCiu1SNxQU"/>
+					<businessModel xmi:value="false"/>
+					<qualityScore value="97"/>
+					<qualityReason value="2&#9;2"/>
+				</xmi:Extension>
+				<memberEnd xmi:idref="pKq8nuyCiu1SNxPm"/>
+				<memberEnd xmi:idref="VKq8nuyCiu1SNxPo"/>
+			</ownedMember>
 		</ownedMember>
 		<ownedMember isAbstract="false" isLeaf="false" name="Essentials" visibility="public" xmi:id="n4FNBuyCiu1SNwd4" xmi:type="uml:Package">
 			<xmi:Extension extender="Visual Paradigm for UML">
@@ -6849,6 +6898,7 @@
 					<businessModel xmi:value="false"/>
 					<qualityScore value="97"/>
 					<qualityReason value="2&#9;2"/>
+					<appliedStereotype xmi:value="Class_prov:type_id"/>
 				</xmi:Extension>
 				<generalization general="m6xjmuyEwTiAAgLk" xmi:id="cELRzuyCiu1SNwzd" xmi:type="uml:Generalization">
 					<xmi:Extension extender="Visual Paradigm for UML">
@@ -6916,6 +6966,48 @@
 					</xmi:Extension>
 				</ownedAttribute>
 			</ownedMember>
+			<ownedMember isAbstract="false" isActive="false" isLeaf="false" name="SoftwareAgent" visibility="public" xmi:id="4V6W3uyCiu1SNxTH" xmi:type="uml:Class">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<isRoot xmi:value="false"/>
+					<modelType value="Class"/>
+					<businessModel xmi:value="false"/>
+					<qualityScore value="-2"/>
+					<appliedStereotype xmi:value="Class_prov:type_id"/>
+				</xmi:Extension>
+				<generalization general="2VbNBuyCiu1SNwe6" xmi:id="tJTW3uyCiu1SNxT." xmi:type="uml:Generalization">
+					<xmi:Extension extender="Visual Paradigm for UML">
+						<qualityScore value="100"/>
+					</xmi:Extension>
+				</generalization>
+			</ownedMember>
+			<ownedMember isAbstract="false" isActive="false" isLeaf="false" name="Person" visibility="public" xmi:id="RB2W3uyCiu1SNxTP" xmi:type="uml:Class">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<isRoot xmi:value="false"/>
+					<modelType value="Class"/>
+					<businessModel xmi:value="false"/>
+					<qualityScore value="-2"/>
+					<appliedStereotype xmi:value="Class_prov:type_id"/>
+				</xmi:Extension>
+				<generalization general="2VbNBuyCiu1SNwe6" xmi:id="BHNW3uyCiu1SNxT2" xmi:type="uml:Generalization">
+					<xmi:Extension extender="Visual Paradigm for UML">
+						<qualityScore value="100"/>
+					</xmi:Extension>
+				</generalization>
+			</ownedMember>
+			<ownedMember isAbstract="false" isActive="false" isLeaf="false" name="Organization" visibility="public" xmi:id="zuuW3uyCiu1SNxTU" xmi:type="uml:Class">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<isRoot xmi:value="false"/>
+					<modelType value="Class"/>
+					<businessModel xmi:value="false"/>
+					<qualityScore value="-2"/>
+					<appliedStereotype xmi:value="Class_prov:type_id"/>
+				</xmi:Extension>
+				<generalization general="2VbNBuyCiu1SNwe6" xmi:id="oCw23uyCiu1SNxUT" xmi:type="uml:Generalization">
+					<xmi:Extension extender="Visual Paradigm for UML">
+						<qualityScore value="100"/>
+					</xmi:Extension>
+				</generalization>
+			</ownedMember>
 		</ownedMember>
 		<ownedMember name="primitive" xmi:id="Class_primitive_id" xmi:type="uml:Stereotype">
 			<xmi:Extension extender="Visual Paradigm for UML">
@@ -6951,6 +7043,7 @@
 					<businessModel xmi:value="false"/>
 					<qualityScore value="97"/>
 					<qualityReason value="2&#9;2"/>
+					<appliedStereotype xmi:value="Class_prov:type_id"/>
 				</xmi:Extension>
 				<generalization general="m6xjmuyEwTiAAgLk" xmi:id="gt_hLuyCiu1SNw4A" xmi:type="uml:Generalization">
 					<xmi:Extension extender="Visual Paradigm for UML">
@@ -7030,6 +7123,7 @@
 					<businessModel xmi:value="false"/>
 					<qualityScore value="97"/>
 					<qualityReason value="2&#9;2"/>
+					<appliedStereotype xmi:value="Class_prov:type_id"/>
 				</xmi:Extension>
 				<generalization general="m6xjmuyEwTiAAgLk" xmi:id="3iRJLuyCiu1SNw6t" xmi:type="uml:Generalization">
 					<xmi:Extension extender="Visual Paradigm for UML">
@@ -7044,6 +7138,7 @@
 					<businessModel xmi:value="false"/>
 					<qualityScore value="97"/>
 					<qualityReason value="2&#9;2"/>
+					<appliedStereotype xmi:value="Class_prov:type_id"/>
 				</xmi:Extension>
 				<generalization general="Jc2JLuyCiu1SNw6o" xmi:id="ouFJLuyCiu1SNw6_" xmi:type="uml:Generalization">
 					<xmi:Extension extender="Visual Paradigm for UML">
@@ -7073,6 +7168,40 @@
 						<qualityReason value="1&#9;1"/>
 					</xmi:Extension>
 				</ownedAttribute>
+				<ownedAttribute aggregation="none" association="Oa6BHuyCiu1SNxLh" isDerived="false" type="L9xJLuyCiu1SNw61" xmi:id="m4aBHuyCiu1SNxLb" xmi:type="uml:Property">
+					<xmi:Extension extender="Visual Paradigm for UML">
+						<associationEnd/>
+						<qualifier name="" xmi:id="m4aBHuyCiu1SNxLc" xmi:type="qualifier">
+							<xmi:Extension extender="Visual Paradigm for UML">
+								<qualityScore value="-1"/>
+							</xmi:Extension>
+						</qualifier>
+						<qualityScore value="95"/>
+						<qualityReason value="1&#9;1"/>
+					</xmi:Extension>
+				</ownedAttribute>
+				<ownedAttribute aggregation="none" association="Oa6BHuyCiu1SNxLh" isDerived="false" isNavigable="true" type="L9xJLuyCiu1SNw61" xmi:id="m4aBHuyCiu1SNxLZ" xmi:type="uml:Property">
+					<xmi:Extension extender="Visual Paradigm for UML">
+						<associationEnd/>
+						<qualifier name="" xmi:id="m4aBHuyCiu1SNxLa" xmi:type="qualifier">
+							<xmi:Extension extender="Visual Paradigm for UML">
+								<qualityScore value="-1"/>
+							</xmi:Extension>
+						</qualifier>
+						<qualityScore value="-1"/>
+					</xmi:Extension>
+				</ownedAttribute>
+				<ownedAttribute aggregation="none" association="ThihHuyCiu1SNxMu" isDerived="false" type="h_YSbuyCiu1SNxFP" xmi:id="SA4hHuyCiu1SNxMb" xmi:type="uml:Property">
+					<xmi:Extension extender="Visual Paradigm for UML">
+						<associationEnd/>
+						<qualifier name="" xmi:id="SA4hHuyCiu1SNxMc" xmi:type="qualifier">
+							<xmi:Extension extender="Visual Paradigm for UML">
+								<qualityScore value="-1"/>
+							</xmi:Extension>
+						</qualifier>
+						<qualityScore value="-1"/>
+					</xmi:Extension>
+				</ownedAttribute>
 			</ownedMember>
 			<ownedMember isAbstract="false" isActive="false" isLeaf="false" name="Key" visibility="public" xmi:id="Xw_ibuyCiu1SNxFK" xmi:type="uml:Class">
 				<xmi:Extension extender="Visual Paradigm for UML">
@@ -7092,12 +7221,23 @@
 					<qualityScore value="97"/>
 					<qualityReason value="2&#9;2"/>
 				</xmi:Extension>
+				<ownedAttribute aggregation="none" association="ThihHuyCiu1SNxMu" isDerived="false" isNavigable="true" type="L9xJLuyCiu1SNw61" xmi:id="SA4hHuyCiu1SNxMd" xmi:type="uml:Property">
+					<xmi:Extension extender="Visual Paradigm for UML">
+						<associationEnd/>
+						<qualifier name="" xmi:id="SA4hHuyCiu1SNxMe" xmi:type="qualifier">
+							<xmi:Extension extender="Visual Paradigm for UML">
+								<qualityScore value="-1"/>
+							</xmi:Extension>
+						</qualifier>
+						<qualityScore value="-1"/>
+					</xmi:Extension>
+				</ownedAttribute>
 			</ownedMember>
-			<ownedMember isAbstract="false" isActive="false" isLeaf="false" name="derivedByInsertionFrom" visibility="public" xmi:id="YmaybuyCiu1SNxGR" xmi:type="uml:AssociationClass">
+			<ownedMember isAbstract="false" isActive="false" isLeaf="false" name="insertion" visibility="public" xmi:id="YmaybuyCiu1SNxGR" xmi:type="uml:AssociationClass">
 				<xmi:Extension extender="Visual Paradigm for UML">
 					<isRoot xmi:value="false"/>
 					<modelType value="Class"/>
-					<association isAbstract="false" isDerived="false" isLeaf="false" name="derivedByInsertionFrom" xmi:id="MMoybuyCiu1SNxF6"/>
+					<association isAbstract="false" isDerived="false" isLeaf="false" name="insertion" xmi:id="MMoybuyCiu1SNxF6"/>
 					<associationClass from="MMoybuyCiu1SNxF6" to="YmaybuyCiu1SNxGR" xmi:id="fpOybuyCiu1SNxGW"/>
 					<businessModel xmi:value="false"/>
 					<qualityScore value="97"/>
@@ -7105,6 +7245,80 @@
 				</xmi:Extension>
 				<memberEnd xmi:idref="MMoybuyCiu1SNxF7"/>
 				<memberEnd xmi:idref="sMoybuyCiu1SNxF9"/>
+				<ownedAttribute aggregation="none" isDerived="false" name="id" ownerScope="instance" xmi:id="8Bp9HuyCiu1SNxNI" xmi:type="uml:Property">
+					<xmi:Extension extender="Visual Paradigm for UML">
+						<attribute/>
+						<isVisble xmi:value="true"/>
+						<qualityScore value="97"/>
+						<qualityReason value="2&#9;2"/>
+					</xmi:Extension>
+				</ownedAttribute>
+				<ownedAttribute aggregation="none" isDerived="false" name="attributes" ownerScope="instance" xmi:id="gq59HuyCiu1SNxNK" xmi:type="uml:Property">
+					<xmi:Extension extender="Visual Paradigm for UML">
+						<attribute/>
+						<isVisble xmi:value="true"/>
+						<qualityScore value="97"/>
+						<qualityReason value="2&#9;2"/>
+					</xmi:Extension>
+				</ownedAttribute>
+			</ownedMember>
+			<ownedMember isAbstract="false" isActive="false" isLeaf="false" name="removal" visibility="public" xmi:id="Oa6BHuyCiu1SNxLh" xmi:type="uml:AssociationClass">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<isRoot xmi:value="false"/>
+					<modelType value="Class"/>
+					<association isAbstract="false" isDerived="false" isLeaf="false" name="removal" xmi:id="m4aBHuyCiu1SNxLY"/>
+					<associationClass from="m4aBHuyCiu1SNxLY" to="Oa6BHuyCiu1SNxLh" xmi:id="Lu.BHuyCiu1SNxLr"/>
+					<businessModel xmi:value="false"/>
+					<qualityScore value="97"/>
+					<qualityReason value="2&#9;2"/>
+				</xmi:Extension>
+				<memberEnd xmi:idref="m4aBHuyCiu1SNxLZ"/>
+				<memberEnd xmi:idref="m4aBHuyCiu1SNxLb"/>
+				<ownedAttribute aggregation="none" isDerived="false" name="id" ownerScope="instance" xmi:id="KV99HuyCiu1SNxNW" xmi:type="uml:Property">
+					<xmi:Extension extender="Visual Paradigm for UML">
+						<attribute/>
+						<isVisble xmi:value="true"/>
+						<qualityScore value="97"/>
+						<qualityReason value="2&#9;2"/>
+					</xmi:Extension>
+				</ownedAttribute>
+				<ownedAttribute aggregation="none" isDerived="false" name="attributes" ownerScope="instance" xmi:id="Yyj9HuyCiu1SNxNY" xmi:type="uml:Property">
+					<xmi:Extension extender="Visual Paradigm for UML">
+						<attribute/>
+						<isVisble xmi:value="true"/>
+						<qualityScore value="97"/>
+						<qualityReason value="2&#9;2"/>
+					</xmi:Extension>
+				</ownedAttribute>
+			</ownedMember>
+			<ownedMember isAbstract="false" isActive="false" isLeaf="false" name="memberOf" visibility="public" xmi:id="ThihHuyCiu1SNxMu" xmi:type="uml:AssociationClass">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<isRoot xmi:value="false"/>
+					<modelType value="Class"/>
+					<association isAbstract="false" isDerived="false" isLeaf="false" name="memberOf" xmi:id="SA4hHuyCiu1SNxMa"/>
+					<associationClass from="SA4hHuyCiu1SNxMa" to="ThihHuyCiu1SNxMu" xmi:id="XpGhHuyCiu1SNxM0"/>
+					<businessModel xmi:value="false"/>
+					<qualityScore value="97"/>
+					<qualityReason value="2&#9;2"/>
+				</xmi:Extension>
+				<memberEnd xmi:idref="SA4hHuyCiu1SNxMb"/>
+				<memberEnd xmi:idref="SA4hHuyCiu1SNxMd"/>
+				<ownedAttribute aggregation="none" isDerived="false" name="id" ownerScope="instance" xmi:id="cM19HuyCiu1SNxNO" xmi:type="uml:Property">
+					<xmi:Extension extender="Visual Paradigm for UML">
+						<attribute/>
+						<isVisble xmi:value="true"/>
+						<qualityScore value="97"/>
+						<qualityReason value="2&#9;2"/>
+					</xmi:Extension>
+				</ownedAttribute>
+				<ownedAttribute aggregation="none" isDerived="false" name="attributes" ownerScope="instance" xmi:id="UXN9HuyCiu1SNxNQ" xmi:type="uml:Property">
+					<xmi:Extension extender="Visual Paradigm for UML">
+						<attribute/>
+						<isVisble xmi:value="true"/>
+						<qualityScore value="97"/>
+						<qualityReason value="2&#9;2"/>
+					</xmi:Extension>
+				</ownedAttribute>
 			</ownedMember>
 		</ownedMember>
 		<ownedMember name="type" xmi:id="Class_type_id" xmi:type="uml:Stereotype">
@@ -7119,6 +7333,12 @@
 				<qualityScore value="-1"/>
 			</xmi:Extension>
 		</ownedMember>
+		<ownedMember name="prov:type" xmi:id="Class_prov:type_id" xmi:type="uml:Stereotype">
+			<xmi:Extension extender="Visual Paradigm for UML">
+				<baseType value="Class"/>
+				<qualityScore value="-1"/>
+			</xmi:Extension>
+		</ownedMember>
 		<ownedMember isAbstract="false" isDerived="false" isLeaf="false" name="starter" xmi:id="v9.uWuyEwTiAAgXF" xmi:type="uml:Association">
 			<memberEnd xmi:idref="v9.uWuyEwTiAAgXG"/>
 			<ownedEnd aggregation="none" association="v9.uWuyEwTiAAgXF" isDerived="false" type="_i1UWuyEwTiAAgSK" xmi:id="v9.uWuyEwTiAAgXG" xmi:type="uml:Property">
@@ -7447,36 +7667,6 @@
 				<qualityReason value="2&#9;2"/>
 			</xmi:Extension>
 		</ownedMember>
-		<ownedMember isAbstract="false" isDerived="false" isLeaf="false" xmi:id="vVSGjuyCiu1SNwm4" xmi:type="uml:Association">
-			<memberEnd xmi:idref="vVSGjuyCiu1SNwm5"/>
-			<ownedEnd aggregation="none" association="vVSGjuyCiu1SNwm4" isDerived="false" name="time" type="tkL1WuyEwTiAAgcE" xmi:id="vVSGjuyCiu1SNwm5" xmi:type="uml:Property">
-				<xmi:Extension extender="Visual Paradigm for UML">
-					<associationEnd/>
-					<qualifier name="" xmi:id="vVSGjuyCiu1SNwm6" xmi:type="qualifier">
-						<xmi:Extension extender="Visual Paradigm for UML">
-							<qualityScore value="-1"/>
-						</xmi:Extension>
-					</qualifier>
-					<qualityScore value="92"/>
-					<qualityReason value="1&#9;1&#10;2&#9;2"/>
-				</xmi:Extension>
-			</ownedEnd>
-			<memberEnd xmi:idref="vVSGjuyCiu1SNwm7"/>
-			<ownedEnd aggregation="none" association="vVSGjuyCiu1SNwm4" isDerived="false" isNavigable="true" type="n0UGjuyCiu1SNwmv" xmi:id="vVSGjuyCiu1SNwm7" xmi:type="uml:Property">
-				<xmi:Extension extender="Visual Paradigm for UML">
-					<associationEnd/>
-					<qualifier name="" xmi:id="vVSGjuyCiu1SNwm8" xmi:type="qualifier">
-						<xmi:Extension extender="Visual Paradigm for UML">
-							<qualityScore value="-1"/>
-						</xmi:Extension>
-					</qualifier>
-					<qualityScore value="-1"/>
-				</xmi:Extension>
-			</ownedEnd>
-			<xmi:Extension extender="Visual Paradigm for UML">
-				<qualityScore value="100"/>
-			</xmi:Extension>
-		</ownedMember>
 		<ownedMember isAbstract="false" isDerived="false" isLeaf="false" name="time" xmi:id="fOWGjuyCiu1SNwnM" xmi:type="uml:Association">
 			<memberEnd xmi:idref="fOWGjuyCiu1SNwnN"/>
 			<ownedEnd aggregation="none" association="fOWGjuyCiu1SNwnM" isDerived="false" type="9un1WuyEwTiAAgcK" xmi:id="fOWGjuyCiu1SNwnN" xmi:type="uml:Property">
@@ -7933,13 +8123,102 @@
 				<qualityScore value="100"/>
 			</xmi:Extension>
 		</ownedMember>
+		<ownedMember isAbstract="false" isDerived="false" isLeaf="false" xmi:id="ghXBHuyCiu1SNxMM" xmi:type="uml:Association">
+			<memberEnd xmi:idref="ghXBHuyCiu1SNxMN"/>
+			<ownedEnd aggregation="none" association="ghXBHuyCiu1SNxMM" isDerived="false" isNavigable="true" type="Oa6BHuyCiu1SNxLh" xmi:id="ghXBHuyCiu1SNxMN" xmi:type="uml:Property">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<associationEnd/>
+					<qualifier name="" xmi:id="ghXBHuyCiu1SNxMO" xmi:type="qualifier">
+						<xmi:Extension extender="Visual Paradigm for UML">
+							<qualityScore value="-1"/>
+						</xmi:Extension>
+					</qualifier>
+					<qualityScore value="-1"/>
+				</xmi:Extension>
+			</ownedEnd>
+			<memberEnd xmi:idref="QhXBHuyCiu1SNxMP"/>
+			<ownedEnd aggregation="none" association="ghXBHuyCiu1SNxMM" isDerived="false" isNavigable="true" type="Xw_ibuyCiu1SNxFK" xmi:id="QhXBHuyCiu1SNxMP" xmi:type="uml:Property">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<associationEnd/>
+					<qualifier name="" xmi:id="QhXBHuyCiu1SNxMQ" xmi:type="qualifier">
+						<xmi:Extension extender="Visual Paradigm for UML">
+							<qualityScore value="-1"/>
+						</xmi:Extension>
+					</qualifier>
+					<qualityScore value="-1"/>
+				</xmi:Extension>
+			</ownedEnd>
+			<xmi:Extension extender="Visual Paradigm for UML">
+				<qualityScore value="100"/>
+			</xmi:Extension>
+		</ownedMember>
+		<ownedMember isAbstract="false" isDerived="false" isLeaf="false" name="time" xmi:id="eWBu3uyCiu1SNxXO" xmi:type="uml:Association">
+			<memberEnd xmi:idref="eWBu3uyCiu1SNxXP"/>
+			<ownedEnd aggregation="none" association="eWBu3uyCiu1SNxXO" isDerived="false" type="tkL1WuyEwTiAAgcE" xmi:id="eWBu3uyCiu1SNxXP" xmi:type="uml:Property">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<associationEnd/>
+					<qualifier name="" xmi:id="eWBu3uyCiu1SNxXQ" xmi:type="qualifier">
+						<xmi:Extension extender="Visual Paradigm for UML">
+							<qualityScore value="-1"/>
+						</xmi:Extension>
+					</qualifier>
+					<qualityScore value="-1"/>
+				</xmi:Extension>
+			</ownedEnd>
+			<memberEnd xmi:idref="eWBu3uyCiu1SNxXR"/>
+			<ownedEnd aggregation="none" association="eWBu3uyCiu1SNxXO" isDerived="false" isNavigable="true" type="n0UGjuyCiu1SNwmv" xmi:id="eWBu3uyCiu1SNxXR" xmi:type="uml:Property">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<associationEnd/>
+					<qualifier name="" xmi:id="eWBu3uyCiu1SNxXS" xmi:type="qualifier">
+						<xmi:Extension extender="Visual Paradigm for UML">
+							<qualityScore value="-1"/>
+						</xmi:Extension>
+					</qualifier>
+					<qualityScore value="-1"/>
+				</xmi:Extension>
+			</ownedEnd>
+			<xmi:Extension extender="Visual Paradigm for UML">
+				<qualityScore value="97"/>
+				<qualityReason value="2&#9;2"/>
+			</xmi:Extension>
+		</ownedMember>
+		<ownedMember isAbstract="false" isDerived="false" isLeaf="false" name="wasInformedBy" xmi:id="1MC5_uyCiu1SNxbJ" xmi:type="uml:Association">
+			<memberEnd xmi:idref="1MC5_uyCiu1SNxbK"/>
+			<ownedEnd aggregation="none" association="1MC5_uyCiu1SNxbJ" isDerived="false" isNavigable="true" type="vTljmuyEwTiAAgLp" xmi:id="1MC5_uyCiu1SNxbK" xmi:type="uml:Property">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<associationEnd/>
+					<qualifier name="" xmi:id="1MC5_uyCiu1SNxbL" xmi:type="qualifier">
+						<xmi:Extension extender="Visual Paradigm for UML">
+							<qualityScore value="-1"/>
+						</xmi:Extension>
+					</qualifier>
+					<qualityScore value="-1"/>
+				</xmi:Extension>
+			</ownedEnd>
+			<memberEnd xmi:idref="1MC5_uyCiu1SNxbM"/>
+			<ownedEnd aggregation="none" association="1MC5_uyCiu1SNxbJ" isDerived="false" type="vTljmuyEwTiAAgLp" xmi:id="1MC5_uyCiu1SNxbM" xmi:type="uml:Property">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<associationEnd/>
+					<qualifier name="" xmi:id="1MC5_uyCiu1SNxbN" xmi:type="qualifier">
+						<xmi:Extension extender="Visual Paradigm for UML">
+							<qualityScore value="-1"/>
+						</xmi:Extension>
+					</qualifier>
+					<qualityScore value="-1"/>
+				</xmi:Extension>
+			</ownedEnd>
+			<xmi:Extension extender="Visual Paradigm for UML">
+				<qualityScore value="97"/>
+				<qualityReason value="2&#9;2"/>
+			</xmi:Extension>
+		</ownedMember>
 	</uml:Model>
 	<uml:Diagram diagramType="ClassDiagram" documentation="" name="Component1" toolName="Visual Paradigm for UML" xmi:id="EUejmuyEwTiAAgLc">
 		<xmi:Extension extender="Visual Paradigm for UML">
 			<properties>
 				<apmAuthor value="lavm"/>
 				<apmCreateDateTime value="1337240969847"/>
-				<apmLastModified value="1337756000871"/>
+				<apmLastModified value="1337876954480"/>
 				<ashowPackageNameStyle value="0"/>
 				<ashowConnectorName value="0"/>
 				<apaintConnectorThroughLabel value="0"/>
@@ -7966,8 +8245,8 @@
 				<amaximized value="true"/>
 				<ax value="0"/>
 				<ay value="0"/>
-				<awidth value="1235"/>
-				<aheight value="505"/>
+				<awidth value="1438"/>
+				<aheight value="761"/>
 				<aqualityScore value="-1"/>
 				<aparentModel value="g7h.WuyEwTiAAgZK"/>
 				<a_globalPaletteOption value="true"/>
@@ -8003,7 +8282,7 @@
 					<properties>
 						<abackground value="Cr:192,192,192,255"/>
 						<aforeground value="Cr:0,0,0,255"/>
-						<azOrder value="26"/>
+						<azOrder value="24"/>
 						<aselectable value="true"/>
 						<arequestResetCaption value="false"/>
 						<arequestResetCaptionSize value="false"/>
@@ -8067,7 +8346,7 @@
 					<properties>
 						<abackground value="Cr:192,192,192,255"/>
 						<aforeground value="Cr:0,0,0,255"/>
-						<azOrder value="22"/>
+						<azOrder value="20"/>
 						<acreatorDiagramType value="ClassDiagram"/>
 						<aselectable value="true"/>
 						<arequestResetCaption value="false"/>
@@ -8132,7 +8411,7 @@
 					<properties>
 						<abackground value="Cr:192,192,192,255"/>
 						<aforeground value="Cr:0,0,0,255"/>
-						<azOrder value="20"/>
+						<azOrder value="18"/>
 						<acreatorDiagramType value="ClassDiagram"/>
 						<aselectable value="true"/>
 						<arequestResetCaption value="false"/>
@@ -8197,7 +8476,7 @@
 					<properties>
 						<abackground value="Cr:192,192,192,255"/>
 						<aforeground value="Cr:0,0,0,255"/>
-						<azOrder value="18"/>
+						<azOrder value="16"/>
 						<acreatorDiagramType value="ClassDiagram"/>
 						<aselectable value="true"/>
 						<arequestResetCaption value="false"/>
@@ -8262,7 +8541,7 @@
 					<properties>
 						<abackground value="Cr:192,192,192,255"/>
 						<aforeground value="Cr:0,0,0,255"/>
-						<azOrder value="16"/>
+						<azOrder value="14"/>
 						<acreatorDiagramType value="ClassDiagram"/>
 						<aselectable value="true"/>
 						<arequestResetCaption value="false"/>
@@ -8327,7 +8606,7 @@
 					<properties>
 						<abackground value="Cr:192,192,192,255"/>
 						<aforeground value="Cr:0,0,0,255"/>
-						<azOrder value="14"/>
+						<azOrder value="12"/>
 						<acreatorDiagramType value="ClassDiagram"/>
 						<aselectable value="true"/>
 						<arequestResetCaption value="false"/>
@@ -8392,7 +8671,7 @@
 					<properties>
 						<abackground value="Cr:122,207,245,255"/>
 						<aforeground value="Cr:0,0,0,255"/>
-						<azOrder value="12"/>
+						<azOrder value="10"/>
 						<aselectable value="true"/>
 						<arequestResetCaption value="false"/>
 						<arequestResetCaptionSize value="false"/>
@@ -8433,7 +8712,7 @@
 					<properties>
 						<abackground value="Cr:192,255,192,255"/>
 						<aforeground value="Cr:0,0,0,255"/>
-						<azOrder value="6"/>
+						<azOrder value="4"/>
 						<aselectable value="true"/>
 						<arequestResetCaption value="false"/>
 						<arequestResetCaptionSize value="false"/>
@@ -8487,75 +8766,9 @@
 				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
 				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
 			</uml:DiagramElement>
-			<uml:DiagramElement geometry="240,390;320,440;320,440;" preferredShapeType="Association" subject="vVSGjuyCiu1SNwm4" xmi:id="fVSGjuyCiu1SNwm9">
-				<xmi:Extension extender="Visual Paradigm for UML">
-					<captionBounds value="277,408,20,0"/>
-					<captionInternalWidth value="-2147483648"/>
-					<captionInternalHeight value="-2147483648"/>
-					<captionVisible value="true"/>
-					<captionSide value="1"/>
-					<roleA roleName="219,398,44,14"/>
-					<properties>
-						<abackground value="Cr:122,207,245,255"/>
-						<aforeground value="Cr:0,0,0,255"/>
-						<azOrder value="-1"/>
-						<acreatorDiagramType value="ClassDiagram"/>
-						<aselectable value="true"/>
-						<arequestResetCaption value="false"/>
-						<arequestResetCaptionSize value="false"/>
-						<aconnectorStyle value="3"/>
-						<aconnectorLineJumps value="4"/>
-						<aconnectorLabelOrientation value="4"/>
-						<afromShapeXDiff value="0"/>
-						<afromShapeYDiff value="0"/>
-						<atoShapeXDiff value="0"/>
-						<atoShapeYDiff value="0"/>
-						<afromConnectType value="0"/>
-						<atoConnectType value="0"/>
-						<auseFromShapeCenter value="true"/>
-						<auseToShapeCenter value="true"/>
-						<afromPinType value="1"/>
-						<atoPinType value="1"/>
-						<arequestRebuild value="false"/>
-						<ashowConnectorName value="2"/>
-						<apaintThroughLabel value="2"/>
-						<ahasRoleAShape value="true"/>
-						<ahasRoleBShape value="false"/>
-						<ashowMultiplicityConstraints value="false"/>
-						<aroleARectangle value="Re:219.0,398.0,44.0,14.0"/>
-						<ahasMultiplicityAShape value="false"/>
-						<ahasMultiplicityBShape value="false"/>
-						<a0SwDr value="false"/>
-						<ashowStereotypes value="true"/>
-						<ashowFromRoleName value="true"/>
-						<ashowToRoleName value="true"/>
-						<ashowFromMultiplicity value="true"/>
-						<ashowToMultiplicity value="true"/>
-						<ashowFromRoleVisibility value="true"/>
-						<ashowToRoleVisibility value="true"/>
-						<ashowAssociationEndPropertyStrings value="false"/>
-						<ahasAssociationEndPropertyStringsAShape value="false"/>
-						<ahasAssociationEndPropertyStringsBShape value="false"/>
-						<afromRoleInternalWidth value="-2147483648"/>
-						<afromRoleInternalHeight value="-2147483648"/>
-						<atoRoleInternalWidth value="-2147483648"/>
-						<atoRoleInternalHeight value="-2147483648"/>
-						<afromMultiplicityInternalWidth value="-2147483648"/>
-						<afromMultiplicityInternalHeight value="-2147483648"/>
-						<atoMultiplicityInternalWidth value="-2147483648"/>
-						<atoMultiplicityInternalHeight value="-2147483648"/>
-						<aassociationEndPropertyStringsAInternalWidth value="-2147483648"/>
-						<aassociationEndPropertyStringsAInternalHeight value="-2147483648"/>
-						<aassociationEndPropertyStringsBInternalWidth value="-2147483648"/>
-						<aassociationEndPropertyStringsBInternalHeight value="-2147483648"/>
-					</properties>
-				</xmi:Extension>
-				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
-				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
-			</uml:DiagramElement>
-			<uml:DiagramElement geometry="360,394;360,439;" preferredShapeType="Association" subject="fOWGjuyCiu1SNwnM" xmi:id="_OWGjuyCiu1SNwnR">
-				<xmi:Extension extender="Visual Paradigm for UML">
-					<captionBounds value="355,400,44,14"/>
+			<uml:DiagramElement geometry="360,390;360,439;" preferredShapeType="Association" subject="fOWGjuyCiu1SNwnM" xmi:id="_OWGjuyCiu1SNwnR">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<captionBounds value="355,398,44,14"/>
 					<captionInternalWidth value="-2147483648"/>
 					<captionInternalHeight value="-2147483648"/>
 					<captionVisible value="true"/>
@@ -8682,9 +8895,9 @@
 				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
 				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
 			</uml:DiagramElement>
-			<uml:DiagramElement geometry="470,394;420,440;" preferredShapeType="Association" subject="yvTGjuyCiu1SNwn8" xmi:id="KvTGjuyCiu1SNwoB">
-				<xmi:Extension extender="Visual Paradigm for UML">
-					<captionBounds value="405,410,44,14"/>
+			<uml:DiagramElement geometry="487,390;420,440;" preferredShapeType="Association" subject="yvTGjuyCiu1SNwn8" xmi:id="KvTGjuyCiu1SNwoB">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<captionBounds value="413,408,44,14"/>
 					<captionInternalWidth value="-2147483648"/>
 					<captionInternalHeight value="-2147483648"/>
 					<captionVisible value="true"/>
@@ -9132,9 +9345,9 @@
 				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
 				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
 			</uml:DiagramElement>
-			<uml:DiagramElement geometry="651,78;651,39;750,39;750,140;671,140;" preferredShapeType="Association" subject="g1DjeuyCiu1SNwVB" xmi:id="E1DjeuyCiu1SNwVN">
-				<xmi:Extension extender="Visual Paradigm for UML">
-					<captionBounds value="735,150,101,14"/>
+			<uml:DiagramElement geometry="651,78;651,59;722,59;722,140;671,140;" preferredShapeType="Association" subject="g1DjeuyCiu1SNwVB" xmi:id="E1DjeuyCiu1SNwVN">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<captionBounds value="689,147,101,14"/>
 					<captionInternalWidth value="-2147483648"/>
 					<captionInternalHeight value="-2147483648"/>
 					<captionVisible value="true"/>
@@ -9196,9 +9409,9 @@
 				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
 				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
 			</uml:DiagramElement>
-			<uml:DiagramElement geometry="720,140;720,329;" preferredShapeType="AssociationClass" subject="fUCTeuyCiu1SNwWy" xmi:id="fUCTeuyCiu1SNwWz">
-				<xmi:Extension extender="Visual Paradigm for UML">
-					<captionBounds value="727,294,20,0"/>
+			<uml:DiagramElement geometry="693,140;693,329;" preferredShapeType="AssociationClass" subject="fUCTeuyCiu1SNwWy" xmi:id="fUCTeuyCiu1SNwWz">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<captionBounds value="700,294,20,0"/>
 					<captionInternalWidth value="-2147483648"/>
 					<captionInternalHeight value="-2147483648"/>
 					<captionVisible value="true"/>
@@ -9241,7 +9454,7 @@
 					<properties>
 						<abackground value="Cr:122,207,245,255"/>
 						<aforeground value="Cr:0,0,0,255"/>
-						<azOrder value="23"/>
+						<azOrder value="21"/>
 						<acreatorDiagramType value="ClassDiagram"/>
 						<aselectable value="true"/>
 						<arequestResetCaption value="false"/>
@@ -9664,7 +9877,7 @@
 			</uml:DiagramElement>
 			<uml:DiagramElement geometry="290,280;290,539;" preferredShapeType="AssociationClass" subject="9G50WuyEwTiAAgTM" xmi:id="9G50WuyEwTiAAgTN">
 				<xmi:Extension extender="Visual Paradigm for UML">
-					<captionBounds value="251,298,20,0"/>
+					<captionBounds value="206,506,20,0"/>
 					<captionInternalWidth value="-2147483648"/>
 					<captionInternalHeight value="-2147483648"/>
 					<captionVisible value="true"/>
@@ -9798,7 +10011,7 @@
 				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
 				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
 			</uml:DiagramElement>
-			<uml:DiagramElement geometry="112,51,609,161" preferredShapeType="SECurveShape" subject="24s2HuyCiu1SNxHD" xmi:id="24s2HuyCiu1SNxHC">
+			<uml:DiagramElement geometry="113,36,684,178" preferredShapeType="SECurveShape" subject="24s2HuyCiu1SNxHD" xmi:id="24s2HuyCiu1SNxHC">
 				<xmi:Extension extender="Visual Paradigm for UML">
 					<captionBounds value="0,0,40,40"/>
 					<captionInternalWidth value="-2147483648"/>
@@ -9808,7 +10021,7 @@
 					<properties>
 						<abackground value="Cr:255,255,192,127"/>
 						<aforeground value="Cr:192,192,192,255"/>
-						<azOrder value="28"/>
+						<azOrder value="26"/>
 						<aselectable value="true"/>
 						<arequestResetCaption value="false"/>
 						<arequestResetCaptionSize value="false"/>
@@ -9824,7 +10037,7 @@
 						<arequestDefaultSize value="false"/>
 						<arequestFitSize value="false"/>
 						<arequestFitSizeFromCenter value="false"/>
-						<aobjectId value="28"/>
+						<aobjectId value="26"/>
 						<aobjectType value="9096"/>
 						<anotUseVisibleBounds value="false"/>
 						<aalpha value="1.0"/>
@@ -9836,42 +10049,42 @@
 					<FontFormat fontColor="Cr:0,0,0,255">
 						<Font name="Dialog" size="11" style="0"/>
 					</FontFormat>
-					<Label location="Pt:416.5,131.5" text=""/>
+					<Label location="Pt:455.00000000000006,125.0" text=""/>
 					<Label transparency="0" tx="0.0" ty="0.0" type="0">
 						<FillFormat renderStyle="1">
 							<AffineTransformMatrix>
-								<Matrix value="1.003454231433506"/>
+								<Matrix value="1.1329879101899827"/>
 								<Matrix value="0.0"/>
 								<Matrix value="0.0"/>
-								<Matrix value="0.8012048192771086"/>
-								<Matrix value="30.67184801381704"/>
-								<Matrix value="28.94578313253015"/>
+								<Matrix value="0.9036144578313259"/>
+								<Matrix value="19.366148531951737"/>
+								<Matrix value="9.337349397590348"/>
 							</AffineTransformMatrix>
 							<Render color="Cr:0,0,0,255"/>
 						</FillFormat>
 					</Label>
-					<ShapeBasePoint point="Pt:416.5,131.5"/>
+					<ShapeBasePoint point="Pt:455.0000000000001,124.99999999999999"/>
 					<Arrow endArrow="0" startArrow="0"/>
 					<LineFormat color="Cr:192,192,192,255" style="91" width="1.0">
 						<Stroke cap="0" dashPhase="0.0" join="0" miterlimit="10.0" type="0" width="1.0"/>
 					</LineFormat>
 					<FillFormat renderStyle="1">
 						<AffineTransformMatrix>
-							<Matrix value="1.003454231433506"/>
+							<Matrix value="1.1329879101899827"/>
 							<Matrix value="0.0"/>
 							<Matrix value="0.0"/>
-							<Matrix value="0.8012048192771086"/>
-							<Matrix value="30.67184801381704"/>
-							<Matrix value="28.94578313253015"/>
+							<Matrix value="0.9036144578313259"/>
+							<Matrix value="19.366148531951737"/>
+							<Matrix value="9.337349397590348"/>
 						</AffineTransformMatrix>
 						<Render color="Cr:255,255,192,127"/>
 					</FillFormat>
 					<CurveList windingRule="1">
 						<Curves>
-							<Curve controlPoint1="Pt:271.25,65.0" controlPoint2="Pt:561.75,65.0" endPoint="Pt:707.0,65.0" objectId="1" startPoint="Pt:126.0,65.0"/>
-							<Curve controlPoint1="Pt:707.0,98.25" controlPoint2="Pt:707.0,164.75" endPoint="Pt:707.0,198.0" objectId="2" startPoint="Pt:707.0,65.0"/>
-							<Curve controlPoint1="Pt:561.75,198.0" controlPoint2="Pt:271.25,198.0" endPoint="Pt:126.0,198.0" objectId="3" startPoint="Pt:707.0,198.0"/>
-							<Curve controlPoint1="Pt:126.0,164.75" controlPoint2="Pt:126.0,98.25" endPoint="Pt:126.0,65.0" objectId="4" startPoint="Pt:126.0,198.0"/>
+							<Curve controlPoint1="Pt:291.0,49.99999999999997" controlPoint2="Pt:619.0,49.99999999999997" endPoint="Pt:783.0000000000002,49.99999999999997" objectId="1" startPoint="Pt:127.0,49.99999999999997"/>
+							<Curve controlPoint1="Pt:783.0000000000002,87.49999999999999" controlPoint2="Pt:783.0000000000002,162.5" endPoint="Pt:783.0000000000002,200.0" objectId="2" startPoint="Pt:783.0000000000002,49.99999999999997"/>
+							<Curve controlPoint1="Pt:619.0,200.0" controlPoint2="Pt:291.0,200.0" endPoint="Pt:127.0,200.0" objectId="3" startPoint="Pt:783.0000000000002,200.0"/>
+							<Curve controlPoint1="Pt:127.0,162.5" controlPoint2="Pt:127.0,87.49999999999999" endPoint="Pt:127.0,49.99999999999997" objectId="4" startPoint="Pt:127.0,200.0"/>
 						</Curves>
 					</CurveList>
 				</xmi:Extension>
@@ -9913,37 +10126,102 @@
 				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
 				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
 			</uml:DiagramElement>
-			<uml:DiagramElement geometry="148,259;148,212;" preferredShapeType="Anchor" subject="EOr2HuyCiu1SNxHr" xmi:id="Yur2HuyCiu1SNxHs">
-				<xmi:Extension extender="Visual Paradigm for UML">
-					<captionBounds value="158,271,20,0"/>
-					<captionInternalWidth value="-2147483648"/>
-					<captionInternalHeight value="-2147483648"/>
-					<captionVisible value="true"/>
-					<captionSide value="1"/>
-					<properties>
-						<abackground value="Cr:122,207,245,255"/>
-						<aforeground value="Cr:0,0,0,255"/>
-						<azOrder value="-1"/>
-						<acreatorDiagramType value="ClassDiagram"/>
-						<aselectable value="true"/>
-						<arequestResetCaption value="false"/>
-						<arequestResetCaptionSize value="false"/>
-						<aconnectorStyle value="3"/>
-						<aconnectorLineJumps value="4"/>
-						<aconnectorLabelOrientation value="4"/>
-						<afromShapeXDiff value="0"/>
-						<afromShapeYDiff value="0"/>
-						<atoShapeXDiff value="0"/>
-						<atoShapeYDiff value="0"/>
-						<afromConnectType value="0"/>
-						<atoConnectType value="0"/>
-						<auseFromShapeCenter value="true"/>
-						<auseToShapeCenter value="true"/>
-						<afromPinType value="1"/>
-						<atoPinType value="1"/>
-						<arequestRebuild value="false"/>
-						<ashowConnectorName value="2"/>
-						<apaintThroughLabel value="2"/>
+			<uml:DiagramElement geometry="148,259;148,200;" preferredShapeType="Anchor" subject="EOr2HuyCiu1SNxHr" xmi:id="Yur2HuyCiu1SNxHs">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<captionBounds value="158,265,20,0"/>
+					<captionInternalWidth value="-2147483648"/>
+					<captionInternalHeight value="-2147483648"/>
+					<captionVisible value="true"/>
+					<captionSide value="1"/>
+					<properties>
+						<abackground value="Cr:122,207,245,255"/>
+						<aforeground value="Cr:0,0,0,255"/>
+						<azOrder value="-1"/>
+						<acreatorDiagramType value="ClassDiagram"/>
+						<aselectable value="true"/>
+						<arequestResetCaption value="false"/>
+						<arequestResetCaptionSize value="false"/>
+						<aconnectorStyle value="3"/>
+						<aconnectorLineJumps value="4"/>
+						<aconnectorLabelOrientation value="4"/>
+						<afromShapeXDiff value="0"/>
+						<afromShapeYDiff value="0"/>
+						<atoShapeXDiff value="0"/>
+						<atoShapeYDiff value="0"/>
+						<afromConnectType value="0"/>
+						<atoConnectType value="0"/>
+						<auseFromShapeCenter value="true"/>
+						<auseToShapeCenter value="true"/>
+						<afromPinType value="1"/>
+						<atoPinType value="1"/>
+						<arequestRebuild value="false"/>
+						<ashowConnectorName value="2"/>
+						<apaintThroughLabel value="2"/>
+					</properties>
+				</xmi:Extension>
+				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
+				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
+			</uml:DiagramElement>
+			<uml:DiagramElement geometry="235,390;320,457;" preferredShapeType="Association" subject="eWBu3uyCiu1SNxXO" xmi:id=".WBu3uyCiu1SNxXT">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<captionBounds value="197,401,44,14"/>
+					<captionInternalWidth value="-2147483648"/>
+					<captionInternalHeight value="-2147483648"/>
+					<captionVisible value="true"/>
+					<captionSide value="1"/>
+					<properties>
+						<abackground value="Cr:122,207,245,255"/>
+						<aforeground value="Cr:0,0,0,255"/>
+						<azOrder value="-1"/>
+						<acreatorDiagramType value="ClassDiagram"/>
+						<aselectable value="true"/>
+						<arequestResetCaption value="false"/>
+						<arequestResetCaptionSize value="false"/>
+						<aconnectorStyle value="3"/>
+						<aconnectorLineJumps value="4"/>
+						<aconnectorLabelOrientation value="4"/>
+						<afromShapeXDiff value="0"/>
+						<afromShapeYDiff value="0"/>
+						<atoShapeXDiff value="0"/>
+						<atoShapeYDiff value="0"/>
+						<afromConnectType value="0"/>
+						<atoConnectType value="0"/>
+						<auseFromShapeCenter value="true"/>
+						<auseToShapeCenter value="true"/>
+						<afromPinType value="1"/>
+						<atoPinType value="2"/>
+						<atoPinRatio value="Pt:0.0,0.42500001192092896"/>
+						<arequestRebuild value="false"/>
+						<ashowConnectorName value="2"/>
+						<apaintThroughLabel value="2"/>
+						<ahasRoleAShape value="false"/>
+						<ahasRoleBShape value="false"/>
+						<ashowMultiplicityConstraints value="false"/>
+						<ahasMultiplicityAShape value="false"/>
+						<ahasMultiplicityBShape value="false"/>
+						<a0SwDr value="false"/>
+						<ashowStereotypes value="true"/>
+						<ashowFromRoleName value="true"/>
+						<ashowToRoleName value="true"/>
+						<ashowFromMultiplicity value="true"/>
+						<ashowToMultiplicity value="true"/>
+						<ashowFromRoleVisibility value="true"/>
+						<ashowToRoleVisibility value="true"/>
+						<ashowAssociationEndPropertyStrings value="false"/>
+						<ahasAssociationEndPropertyStringsAShape value="false"/>
+						<ahasAssociationEndPropertyStringsBShape value="false"/>
+						<afromRoleInternalWidth value="-2147483648"/>
+						<afromRoleInternalHeight value="-2147483648"/>
+						<atoRoleInternalWidth value="-2147483648"/>
+						<atoRoleInternalHeight value="-2147483648"/>
+						<afromMultiplicityInternalWidth value="-2147483648"/>
+						<afromMultiplicityInternalHeight value="-2147483648"/>
+						<atoMultiplicityInternalWidth value="-2147483648"/>
+						<atoMultiplicityInternalHeight value="-2147483648"/>
+						<aassociationEndPropertyStringsAInternalWidth value="-2147483648"/>
+						<aassociationEndPropertyStringsAInternalHeight value="-2147483648"/>
+						<aassociationEndPropertyStringsBInternalWidth value="-2147483648"/>
+						<aassociationEndPropertyStringsBInternalHeight value="-2147483648"/>
 					</properties>
 				</xmi:Extension>
 				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
@@ -9956,7 +10234,7 @@
 			<properties>
 				<apmAuthor value="lavm"/>
 				<apmCreateDateTime value="1337258412202"/>
-				<apmLastModified value="1337756012184"/>
+				<apmLastModified value="1337877015595"/>
 				<ashowPackageNameStyle value="0"/>
 				<ashowConnectorName value="0"/>
 				<apaintConnectorThroughLabel value="0"/>
@@ -9984,7 +10262,7 @@
 				<ax value="0"/>
 				<ay value="0"/>
 				<awidth value="1235"/>
-				<aheight value="505"/>
+				<aheight value="507"/>
 				<aqualityScore value="-1"/>
 				<aparentModel value="WzQLWuyEwTiAAgey"/>
 				<a_globalPaletteOption value="true"/>
@@ -10010,7 +10288,71 @@
 			</properties>
 		</xmi:Extension>
 		<uml:Diagram.element>
-			<uml:DiagramElement geometry="700,110,80,80" preferredShapeType="Class" subject="vTljmuyEwTiAAgLp" xmi:id="7rBLWuyEwTiAAgfZ">
+			<uml:DiagramElement geometry="700,110,80,78" preferredShapeType="Class" subject="vTljmuyEwTiAAgLp" xmi:id="7rBLWuyEwTiAAgfZ">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<captionBounds value="0,0,80,14"/>
+					<captionInternalWidth value="-2147483648"/>
+					<captionInternalHeight value="-2147483648"/>
+					<captionVisible value="true"/>
+					<captionSide value="12"/>
+					<properties>
+						<abackground value="Cr:122,207,245,255"/>
+						<aforeground value="Cr:0,0,0,255"/>
+						<azOrder value="21"/>
+						<aselectable value="true"/>
+						<arequestResetCaption value="false"/>
+						<arequestResetCaptionSize value="false"/>
+						<adisplayStereotypeIcon value="false"/>
+						<aoverrideAppearanceWithStereotypeIcon value="true"/>
+						<arequestSetSizeOption value="0"/>
+						<aparentConnectorHeaderLength value="40"/>
+						<aparentConnectorLineLength value="10"/>
+						<aconnectToPoint value="true"/>
+						<aparentConnectorDTheta value="0.0"/>
+						<aconnectionPointType value="2"/>
+						<amodelElementNameAlignment value="9"/>
+						<arequestDefaultSize value="false"/>
+						<arequestFitSize value="false"/>
+						<arequestFitSizeFromCenter value="false"/>
+						<adisplayAsRobustnessAnalysisIcon value="true"/>
+						<avisibilityStyle value="1"/>
+						<ashowAttributeType value="1"/>
+						<ashowOperationType value="1"/>
+						<amSwTpPts value="true"/>
+						<alshRfAts value="true"/>
+						<amShDrAt value="false"/>
+						<akShDrOp value="false"/>
+						<akSwCsMbSt value="true"/>
+						<ashowClassMemberConstraints value="true"/>
+						<alShCmMl value="false"/>
+						<ashowOperationParameterDirection value="false"/>
+						<ashowOperationRaisedExceptions value="false"/>
+						<ashowParameterNameInOperationSignature value="true"/>
+						<ashowOperationTemplateParameters value="false"/>
+						<ashowOperationProperties value="false"/>
+						<awpMbs value="false"/>
+						<aattributeSortType value="0"/>
+						<aoperationSortType value="0"/>
+						<ashowInitialAttributeValue value="true"/>
+						<ashowOperationSignature value="true"/>
+						<ainterfaceBall value="false"/>
+						<ashowEmptyCompartments value="0"/>
+						<ashowEllipsisForUnshownMembers value="0"/>
+						<ashowAttributesCodeDetails value="0"/>
+						<ashowOperationsCodeDetails value="0"/>
+						<ashowParametersCodeDetails value="0"/>
+						<ashowTypeOption value="0"/>
+						<ashowOwnerOption value="3"/>
+						<ashowAttributesType value="0"/>
+						<ashowOperationsParameters value="0"/>
+						<ashowOperationsReturnType value="0"/>
+					</properties>
+				</xmi:Extension>
+				<elementFill color1="Cr:122,207,245,255" color2="" style="1" transparency="0" type="1"/>
+				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
+				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
+			</uml:DiagramElement>
+			<uml:DiagramElement geometry="360,132,80,59" preferredShapeType="Class" subject="m6xjmuyEwTiAAgLk" xmi:id="B3VLWuyEwTiAAgfm">
 				<xmi:Extension extender="Visual Paradigm for UML">
 					<captionBounds value="0,0,80,14"/>
 					<captionInternalWidth value="-2147483648"/>
@@ -10074,73 +10416,9 @@
 				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
 				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
 			</uml:DiagramElement>
-			<uml:DiagramElement geometry="360,140,80,50" preferredShapeType="Class" subject="m6xjmuyEwTiAAgLk" xmi:id="B3VLWuyEwTiAAgfm">
-				<xmi:Extension extender="Visual Paradigm for UML">
-					<captionBounds value="0,0,80,14"/>
-					<captionInternalWidth value="-2147483648"/>
-					<captionInternalHeight value="-2147483648"/>
-					<captionVisible value="true"/>
-					<captionSide value="12"/>
-					<properties>
-						<abackground value="Cr:122,207,245,255"/>
-						<aforeground value="Cr:0,0,0,255"/>
-						<azOrder value="17"/>
-						<aselectable value="true"/>
-						<arequestResetCaption value="false"/>
-						<arequestResetCaptionSize value="false"/>
-						<adisplayStereotypeIcon value="false"/>
-						<aoverrideAppearanceWithStereotypeIcon value="true"/>
-						<arequestSetSizeOption value="0"/>
-						<aparentConnectorHeaderLength value="40"/>
-						<aparentConnectorLineLength value="10"/>
-						<aconnectToPoint value="true"/>
-						<aparentConnectorDTheta value="0.0"/>
-						<aconnectionPointType value="2"/>
-						<amodelElementNameAlignment value="9"/>
-						<arequestDefaultSize value="false"/>
-						<arequestFitSize value="false"/>
-						<arequestFitSizeFromCenter value="false"/>
-						<adisplayAsRobustnessAnalysisIcon value="true"/>
-						<avisibilityStyle value="1"/>
-						<ashowAttributeType value="1"/>
-						<ashowOperationType value="1"/>
-						<amSwTpPts value="true"/>
-						<alshRfAts value="true"/>
-						<amShDrAt value="false"/>
-						<akShDrOp value="false"/>
-						<akSwCsMbSt value="true"/>
-						<ashowClassMemberConstraints value="true"/>
-						<alShCmMl value="false"/>
-						<ashowOperationParameterDirection value="false"/>
-						<ashowOperationRaisedExceptions value="false"/>
-						<ashowParameterNameInOperationSignature value="true"/>
-						<ashowOperationTemplateParameters value="false"/>
-						<ashowOperationProperties value="false"/>
-						<awpMbs value="false"/>
-						<aattributeSortType value="0"/>
-						<aoperationSortType value="0"/>
-						<ashowInitialAttributeValue value="true"/>
-						<ashowOperationSignature value="true"/>
-						<ainterfaceBall value="false"/>
-						<ashowEmptyCompartments value="0"/>
-						<ashowEllipsisForUnshownMembers value="0"/>
-						<ashowAttributesCodeDetails value="0"/>
-						<ashowOperationsCodeDetails value="0"/>
-						<ashowParametersCodeDetails value="0"/>
-						<ashowTypeOption value="0"/>
-						<ashowOwnerOption value="3"/>
-						<ashowAttributesType value="0"/>
-						<ashowOperationsParameters value="0"/>
-						<ashowOperationsReturnType value="0"/>
-					</properties>
-				</xmi:Extension>
-				<elementFill color1="Cr:122,207,245,255" color2="" style="1" transparency="0" type="1"/>
-				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
-				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
-			</uml:DiagramElement>
-			<uml:DiagramElement geometry="420,139;420,110;480,110;480,165;440,165;" preferredShapeType="Association" subject="LrnLWuyEwTiAAggO" xmi:id="LrnLWuyEwTiAAggT">
-				<xmi:Extension extender="Visual Paradigm for UML">
-					<captionBounds value="450,94,108,14"/>
+			<uml:DiagramElement geometry="420,131;420,102;480,102;480,157;440,157;" preferredShapeType="Association" subject="LrnLWuyEwTiAAggO" xmi:id="LrnLWuyEwTiAAggT">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<captionBounds value="476,114,108,14"/>
 					<captionInternalWidth value="-2147483648"/>
 					<captionInternalHeight value="-2147483648"/>
 					<captionVisible value="true"/>
@@ -10212,7 +10490,7 @@
 					<properties>
 						<abackground value="Cr:192,192,192,255"/>
 						<aforeground value="Cr:0,0,0,255"/>
-						<azOrder value="15"/>
+						<azOrder value="17"/>
 						<acreatorDiagramType value="ClassDiagram"/>
 						<aselectable value="true"/>
 						<arequestResetCaption value="false"/>
@@ -10267,9 +10545,9 @@
 				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
 				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
 			</uml:DiagramElement>
-			<uml:DiagramElement geometry="467,165;467,239;" preferredShapeType="AssociationClass" subject="fBMrWuyEwTiAAggi" xmi:id="fBMrWuyEwTiAAggj">
-				<xmi:Extension extender="Visual Paradigm for UML">
-					<captionBounds value="461,214,20,0"/>
+			<uml:DiagramElement geometry="467,157;467,239;" preferredShapeType="AssociationClass" subject="fBMrWuyEwTiAAggi" xmi:id="fBMrWuyEwTiAAggj">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<captionBounds value="461,211,20,0"/>
 					<captionInternalWidth value="-2147483648"/>
 					<captionInternalHeight value="-2147483648"/>
 					<captionVisible value="true"/>
@@ -10312,7 +10590,7 @@
 					<properties>
 						<abackground value="Cr:192,192,192,255"/>
 						<aforeground value="Cr:0,0,0,255"/>
-						<azOrder value="13"/>
+						<azOrder value="15"/>
 						<aselectable value="true"/>
 						<arequestResetCaption value="false"/>
 						<arequestResetCaptionSize value="false"/>
@@ -10376,7 +10654,7 @@
 					<properties>
 						<abackground value="Cr:192,192,192,255"/>
 						<aforeground value="Cr:0,0,0,255"/>
-						<azOrder value="11"/>
+						<azOrder value="13"/>
 						<aselectable value="true"/>
 						<arequestResetCaption value="false"/>
 						<arequestResetCaptionSize value="false"/>
@@ -10430,9 +10708,9 @@
 				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
 				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
 			</uml:DiagramElement>
-			<uml:DiagramElement geometry="570,241;700,169;" preferredShapeType="Association" subject="pJ.rWuyEwTiAAghI" xmi:id="pJ.rWuyEwTiAAghN">
-				<xmi:Extension extender="Visual Paradigm for UML">
-					<captionBounds value="617,176,58,14"/>
+			<uml:DiagramElement geometry="570,241;700,187;" preferredShapeType="Association" subject="pJ.rWuyEwTiAAghI" xmi:id="pJ.rWuyEwTiAAghN">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<captionBounds value="624,216,58,14"/>
 					<captionInternalWidth value="-2147483648"/>
 					<captionInternalHeight value="-2147483648"/>
 					<captionVisible value="true"/>
@@ -10624,9 +10902,9 @@
 				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
 				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
 			</uml:DiagramElement>
-			<uml:DiagramElement geometry="344,380,120,40" preferredShapeType="Class" subject="iwsbWuyEwTiAAgiT" xmi:id="iwsbWuyEwTiAAgiS">
-				<xmi:Extension extender="Visual Paradigm for UML">
-					<captionBounds value="0,0,120,14"/>
+			<uml:DiagramElement geometry="344,380,105,40" preferredShapeType="Class" subject="iwsbWuyEwTiAAgiT" xmi:id="iwsbWuyEwTiAAgiS">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<captionBounds value="0,0,105,28"/>
 					<captionInternalWidth value="-2147483648"/>
 					<captionInternalHeight value="-2147483648"/>
 					<captionVisible value="true"/>
@@ -10634,7 +10912,7 @@
 					<properties>
 						<abackground value="Cr:192,192,192,255"/>
 						<aforeground value="Cr:0,0,0,255"/>
-						<azOrder value="9"/>
+						<azOrder value="11"/>
 						<acreatorDiagramType value="ClassDiagram"/>
 						<aselectable value="true"/>
 						<arequestResetCaption value="false"/>
@@ -10689,9 +10967,9 @@
 				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
 				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
 			</uml:DiagramElement>
-			<uml:DiagramElement geometry="460,290;460,379;" preferredShapeType="Generalization" subject="c8WbWuyEwTiAAgig" xmi:id="c8WbWuyEwTiAAgih">
-				<xmi:Extension extender="Visual Paradigm for UML">
-					<captionBounds value="458,329,20,0"/>
+			<uml:DiagramElement geometry="460,290;448,380;" preferredShapeType="Generalization" subject="c8WbWuyEwTiAAgig" xmi:id="c8WbWuyEwTiAAgih">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<captionBounds value="453,330,20,0"/>
 					<captionInternalWidth value="-2147483648"/>
 					<captionInternalHeight value="-2147483648"/>
 					<captionVisible value="true"/>
@@ -10725,9 +11003,9 @@
 				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
 				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
 			</uml:DiagramElement>
-			<uml:DiagramElement geometry="410,139;410,44;314,44;314,160;359,160;" preferredShapeType="Association" subject="77xbWuyEwTiAAgi0" xmi:id="H7xbWuyEwTiAAgi5">
-				<xmi:Extension extender="Visual Paradigm for UML">
-					<captionBounds value="322,28,97,14"/>
+			<uml:DiagramElement geometry="410,131;410,36;314,36;314,152;359,152;" preferredShapeType="Association" subject="77xbWuyEwTiAAgi0" xmi:id="H7xbWuyEwTiAAgi5">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<captionBounds value="288,18,97,14"/>
 					<captionInternalWidth value="-2147483648"/>
 					<captionInternalHeight value="-2147483648"/>
 					<captionVisible value="true"/>
@@ -10789,44 +11067,44 @@
 				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
 				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
 			</uml:DiagramElement>
-			<uml:DiagramElement geometry="350,160;350,379;" preferredShapeType="AssociationClass" subject="bCjbWuyEwTiAAgjB" xmi:id="bCjbWuyEwTiAAgjC">
-				<xmi:Extension extender="Visual Paradigm for UML">
-					<captionBounds value="361,290,20,0"/>
-					<captionInternalWidth value="-2147483648"/>
-					<captionInternalHeight value="-2147483648"/>
-					<captionVisible value="true"/>
-					<captionSide value="1"/>
-					<properties>
-						<abackground value="Cr:122,207,245,255"/>
-						<aforeground value="Cr:0,0,0,255"/>
-						<azOrder value="-1"/>
-						<aselectable value="true"/>
-						<arequestResetCaption value="false"/>
-						<arequestResetCaptionSize value="false"/>
-						<aconnectorStyle value="3"/>
-						<aconnectorLineJumps value="4"/>
-						<aconnectorLabelOrientation value="4"/>
-						<afromShapeXDiff value="0"/>
-						<afromShapeYDiff value="0"/>
-						<atoShapeXDiff value="0"/>
-						<atoShapeYDiff value="0"/>
-						<afromConnectType value="0"/>
-						<atoConnectType value="0"/>
-						<auseFromShapeCenter value="true"/>
-						<auseToShapeCenter value="true"/>
-						<afromPinType value="1"/>
-						<atoPinType value="1"/>
-						<arequestRebuild value="false"/>
-						<ashowConnectorName value="2"/>
-						<apaintThroughLabel value="2"/>
-					</properties>
-				</xmi:Extension>
-				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
-				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
-			</uml:DiagramElement>
-			<uml:DiagramElement geometry="390,139;390,61;286,61;286,170;359,170;" preferredShapeType="Association" subject="gi8U.uyCiu1SNwYm" xmi:id="gi8U.uyCiu1SNwYr">
-				<xmi:Extension extender="Visual Paradigm for UML">
-					<captionBounds value="203,44,107,14"/>
+			<uml:DiagramElement geometry="350,152;350,379;" preferredShapeType="AssociationClass" subject="bCjbWuyEwTiAAgjB" xmi:id="bCjbWuyEwTiAAgjC">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<captionBounds value="361,287,20,0"/>
+					<captionInternalWidth value="-2147483648"/>
+					<captionInternalHeight value="-2147483648"/>
+					<captionVisible value="true"/>
+					<captionSide value="1"/>
+					<properties>
+						<abackground value="Cr:122,207,245,255"/>
+						<aforeground value="Cr:0,0,0,255"/>
+						<azOrder value="-1"/>
+						<aselectable value="true"/>
+						<arequestResetCaption value="false"/>
+						<arequestResetCaptionSize value="false"/>
+						<aconnectorStyle value="3"/>
+						<aconnectorLineJumps value="4"/>
+						<aconnectorLabelOrientation value="4"/>
+						<afromShapeXDiff value="0"/>
+						<afromShapeYDiff value="0"/>
+						<atoShapeXDiff value="0"/>
+						<atoShapeYDiff value="0"/>
+						<afromConnectType value="0"/>
+						<atoConnectType value="0"/>
+						<auseFromShapeCenter value="true"/>
+						<auseToShapeCenter value="true"/>
+						<afromPinType value="1"/>
+						<atoPinType value="1"/>
+						<arequestRebuild value="false"/>
+						<ashowConnectorName value="2"/>
+						<apaintThroughLabel value="2"/>
+					</properties>
+				</xmi:Extension>
+				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
+				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
+			</uml:DiagramElement>
+			<uml:DiagramElement geometry="390,131;390,53;286,53;286,162;359,162;" preferredShapeType="Association" subject="gi8U.uyCiu1SNwYm" xmi:id="gi8U.uyCiu1SNwYr">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<captionBounds value="206,37,107,14"/>
 					<captionInternalWidth value="-2147483648"/>
 					<captionInternalHeight value="-2147483648"/>
 					<captionVisible value="true"/>
@@ -10888,9 +11166,9 @@
 				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
 				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
 			</uml:DiagramElement>
-			<uml:DiagramElement geometry="380,139;380,79;264,79;264,180;359,180;" preferredShapeType="Association" subject="D2RU.uyCiu1SNwZA" xmi:id="j2RU.uyCiu1SNwZF">
-				<xmi:Extension extender="Visual Paradigm for UML">
-					<captionBounds value="144,90,118,14"/>
+			<uml:DiagramElement geometry="380,131;380,71;264,71;264,172;359,172;" preferredShapeType="Association" subject="D2RU.uyCiu1SNwZA" xmi:id="j2RU.uyCiu1SNwZF">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<captionBounds value="164,54,118,14"/>
 					<captionInternalWidth value="-2147483648"/>
 					<captionInternalHeight value="-2147483648"/>
 					<captionVisible value="true"/>
@@ -10952,9 +11230,74 @@
 				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
 				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
 			</uml:DiagramElement>
-			<uml:DiagramElement geometry="213,380,120,40" preferredShapeType="Class" subject="ZKXU.uyCiu1SNwZb" xmi:id="ZKXU.uyCiu1SNwZa">
-				<xmi:Extension extender="Visual Paradigm for UML">
-					<captionBounds value="0,0,120,14"/>
+			<uml:DiagramElement geometry="213,380,113,40" preferredShapeType="Class" subject="ZKXU.uyCiu1SNwZb" xmi:id="ZKXU.uyCiu1SNwZa">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<captionBounds value="0,0,113,28"/>
+					<captionInternalWidth value="-2147483648"/>
+					<captionInternalHeight value="-2147483648"/>
+					<captionVisible value="true"/>
+					<captionSide value="12"/>
+					<properties>
+						<abackground value="Cr:192,192,192,255"/>
+						<aforeground value="Cr:0,0,0,255"/>
+						<azOrder value="7"/>
+						<acreatorDiagramType value="ClassDiagram"/>
+						<aselectable value="true"/>
+						<arequestResetCaption value="false"/>
+						<arequestResetCaptionSize value="false"/>
+						<adisplayStereotypeIcon value="false"/>
+						<aoverrideAppearanceWithStereotypeIcon value="true"/>
+						<arequestSetSizeOption value="0"/>
+						<aparentConnectorHeaderLength value="40"/>
+						<aparentConnectorLineLength value="10"/>
+						<aconnectToPoint value="true"/>
+						<aparentConnectorDTheta value="0.0"/>
+						<aconnectionPointType value="2"/>
+						<amodelElementNameAlignment value="9"/>
+						<arequestDefaultSize value="false"/>
+						<arequestFitSize value="false"/>
+						<arequestFitSizeFromCenter value="false"/>
+						<adisplayAsRobustnessAnalysisIcon value="true"/>
+						<avisibilityStyle value="1"/>
+						<ashowAttributeType value="1"/>
+						<ashowOperationType value="1"/>
+						<amSwTpPts value="true"/>
+						<alshRfAts value="true"/>
+						<amShDrAt value="false"/>
+						<akShDrOp value="false"/>
+						<akSwCsMbSt value="true"/>
+						<ashowClassMemberConstraints value="true"/>
+						<alShCmMl value="false"/>
+						<ashowOperationParameterDirection value="false"/>
+						<ashowOperationRaisedExceptions value="false"/>
+						<ashowParameterNameInOperationSignature value="true"/>
+						<ashowOperationTemplateParameters value="false"/>
+						<ashowOperationProperties value="false"/>
+						<awpMbs value="false"/>
+						<aattributeSortType value="0"/>
+						<aoperationSortType value="0"/>
+						<ashowInitialAttributeValue value="true"/>
+						<ashowOperationSignature value="true"/>
+						<ainterfaceBall value="false"/>
+						<ashowEmptyCompartments value="0"/>
+						<ashowEllipsisForUnshownMembers value="0"/>
+						<ashowAttributesCodeDetails value="0"/>
+						<ashowOperationsCodeDetails value="0"/>
+						<ashowParametersCodeDetails value="0"/>
+						<ashowTypeOption value="0"/>
+						<ashowOwnerOption value="3"/>
+						<ashowAttributesType value="0"/>
+						<ashowOperationsParameters value="0"/>
+						<ashowOperationsReturnType value="0"/>
+					</properties>
+				</xmi:Extension>
+				<elementFill color1="Cr:192,192,192,255" color2="" style="1" transparency="0" type="1"/>
+				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
+				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
+			</uml:DiagramElement>
+			<uml:DiagramElement geometry="70,380,125,40" preferredShapeType="Class" subject="W8Q0.uyCiu1SNwZl" xmi:id="W8Q0.uyCiu1SNwZk">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<captionBounds value="0,0,125,28"/>
 					<captionInternalWidth value="-2147483648"/>
 					<captionInternalHeight value="-2147483648"/>
 					<captionVisible value="true"/>
@@ -11017,9 +11360,365 @@
 				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
 				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
 			</uml:DiagramElement>
-			<uml:DiagramElement geometry="70,380,130,40" preferredShapeType="Class" subject="W8Q0.uyCiu1SNwZl" xmi:id="W8Q0.uyCiu1SNwZk">
-				<xmi:Extension extender="Visual Paradigm for UML">
-					<captionBounds value="0,0,130,14"/>
+			<uml:DiagramElement geometry="450,290;326,380;" preferredShapeType="Generalization" subject="6eo0.uyCiu1SNwZp" xmi:id="6eo0.uyCiu1SNwZq">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<captionBounds value="378,330,20,0"/>
+					<captionInternalWidth value="-2147483648"/>
+					<captionInternalHeight value="-2147483648"/>
+					<captionVisible value="true"/>
+					<captionSide value="1"/>
+					<properties>
+						<abackground value="Cr:255,255,255,255"/>
+						<aforeground value="Cr:0,0,0,255"/>
+						<azOrder value="-1"/>
+						<acreatorDiagramType value="ClassDiagram"/>
+						<aselectable value="true"/>
+						<arequestResetCaption value="false"/>
+						<arequestResetCaptionSize value="false"/>
+						<aconnectorStyle value="3"/>
+						<aconnectorLineJumps value="4"/>
+						<aconnectorLabelOrientation value="4"/>
+						<afromShapeXDiff value="0"/>
+						<afromShapeYDiff value="0"/>
+						<atoShapeXDiff value="0"/>
+						<atoShapeYDiff value="0"/>
+						<afromConnectType value="0"/>
+						<atoConnectType value="0"/>
+						<auseFromShapeCenter value="true"/>
+						<auseToShapeCenter value="true"/>
+						<afromPinType value="1"/>
+						<atoPinType value="1"/>
+						<arequestRebuild value="false"/>
+						<ashowConnectorName value="2"/>
+						<apaintThroughLabel value="2"/>
+					</properties>
+				</xmi:Extension>
+				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
+				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
+			</uml:DiagramElement>
+			<uml:DiagramElement geometry="450,272;195,381;" preferredShapeType="Generalization" subject="cW40.uyCiu1SNwZt" xmi:id="8W40.uyCiu1SNwZu">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<captionBounds value="313,326,20,0"/>
+					<captionInternalWidth value="-2147483648"/>
+					<captionInternalHeight value="-2147483648"/>
+					<captionVisible value="true"/>
+					<captionSide value="1"/>
+					<properties>
+						<abackground value="Cr:255,255,255,255"/>
+						<aforeground value="Cr:0,0,0,255"/>
+						<azOrder value="-1"/>
+						<acreatorDiagramType value="ClassDiagram"/>
+						<aselectable value="true"/>
+						<arequestResetCaption value="false"/>
+						<arequestResetCaptionSize value="false"/>
+						<aconnectorStyle value="3"/>
+						<aconnectorLineJumps value="4"/>
+						<aconnectorLabelOrientation value="4"/>
+						<afromShapeXDiff value="0"/>
+						<afromShapeYDiff value="0"/>
+						<atoShapeXDiff value="0"/>
+						<atoShapeYDiff value="0"/>
+						<afromConnectType value="0"/>
+						<atoConnectType value="0"/>
+						<auseFromShapeCenter value="true"/>
+						<auseToShapeCenter value="true"/>
+						<afromPinType value="1"/>
+						<atoPinType value="1"/>
+						<arequestRebuild value="false"/>
+						<ashowConnectorName value="2"/>
+						<apaintThroughLabel value="2"/>
+					</properties>
+				</xmi:Extension>
+				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
+				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
+			</uml:DiagramElement>
+			<uml:DiagramElement geometry="299,162;299,379;" preferredShapeType="AssociationClass" subject="tqk0.uyCiu1SNwZx" xmi:id="tqk0.uyCiu1SNwZy">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<captionBounds value="314,285,20,0"/>
+					<captionInternalWidth value="-2147483648"/>
+					<captionInternalHeight value="-2147483648"/>
+					<captionVisible value="true"/>
+					<captionSide value="1"/>
+					<properties>
+						<abackground value="Cr:122,207,245,255"/>
+						<aforeground value="Cr:0,0,0,255"/>
+						<azOrder value="-1"/>
+						<aselectable value="true"/>
+						<arequestResetCaption value="false"/>
+						<arequestResetCaptionSize value="false"/>
+						<aconnectorStyle value="3"/>
+						<aconnectorLineJumps value="4"/>
+						<aconnectorLabelOrientation value="4"/>
+						<afromShapeXDiff value="0"/>
+						<afromShapeYDiff value="0"/>
+						<atoShapeXDiff value="0"/>
+						<atoShapeYDiff value="0"/>
+						<afromConnectType value="0"/>
+						<atoConnectType value="0"/>
+						<auseFromShapeCenter value="true"/>
+						<auseToShapeCenter value="true"/>
+						<afromPinType value="1"/>
+						<atoPinType value="1"/>
+						<arequestRebuild value="false"/>
+						<ashowConnectorName value="2"/>
+						<apaintThroughLabel value="2"/>
+					</properties>
+				</xmi:Extension>
+				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
+				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
+			</uml:DiagramElement>
+			<uml:DiagramElement geometry="274,172;194,380;" preferredShapeType="AssociationClass" subject="blc0.uyCiu1SNwZ3" xmi:id="7lc0.uyCiu1SNwZ4">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<captionBounds value="251,282,20,0"/>
+					<captionInternalWidth value="-2147483648"/>
+					<captionInternalHeight value="-2147483648"/>
+					<captionVisible value="true"/>
+					<captionSide value="1"/>
+					<properties>
+						<abackground value="Cr:122,207,245,255"/>
+						<aforeground value="Cr:0,0,0,255"/>
+						<azOrder value="-1"/>
+						<aselectable value="true"/>
+						<arequestResetCaption value="false"/>
+						<arequestResetCaptionSize value="false"/>
+						<aconnectorStyle value="3"/>
+						<aconnectorLineJumps value="4"/>
+						<aconnectorLabelOrientation value="4"/>
+						<afromShapeXDiff value="0"/>
+						<afromShapeYDiff value="0"/>
+						<atoShapeXDiff value="0"/>
+						<atoShapeYDiff value="0"/>
+						<afromConnectType value="0"/>
+						<atoConnectType value="0"/>
+						<auseFromShapeCenter value="true"/>
+						<auseToShapeCenter value="true"/>
+						<afromPinType value="1"/>
+						<atoPinType value="1"/>
+						<arequestRebuild value="false"/>
+						<ashowConnectorName value="2"/>
+						<apaintThroughLabel value="2"/>
+					</properties>
+				</xmi:Extension>
+				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
+				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
+			</uml:DiagramElement>
+			<uml:DiagramElement geometry="560,0,159,71" preferredShapeType="NOTE" subject="afB2HuyCiu1SNxHe" xmi:id="kb6uHuyCiu1SNxJN">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<captionBounds value="0,0,159,0"/>
+					<captionInternalWidth value="-2147483648"/>
+					<captionInternalHeight value="-2147483648"/>
+					<captionVisible value="true"/>
+					<captionSide value="12"/>
+					<properties>
+						<abackground value="Cr:255,255,192,127"/>
+						<aforeground value="Cr:0,0,0,255"/>
+						<azOrder value="2"/>
+						<aselectable value="true"/>
+						<arequestResetCaption value="false"/>
+						<arequestResetCaptionSize value="false"/>
+						<adisplayStereotypeIcon value="false"/>
+						<aoverrideAppearanceWithStereotypeIcon value="true"/>
+						<arequestSetSizeOption value="0"/>
+						<aparentConnectorHeaderLength value="40"/>
+						<aparentConnectorLineLength value="10"/>
+						<aconnectToPoint value="true"/>
+						<aparentConnectorDTheta value="0.0"/>
+						<aconnectionPointType value="2"/>
+						<amodelElementNameAlignment value="9"/>
+						<arequestDefaultSize value="false"/>
+						<arequestFitSize value="false"/>
+						<arequestFitSizeFromCenter value="false"/>
+						<aangle value="0"/>
+					</properties>
+				</xmi:Extension>
+				<elementFill color1="Cr:255,255,192,127" color2="" style="1" transparency="50" type="1"/>
+				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
+				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
+			</uml:DiagramElement>
+			<uml:DiagramElement geometry="310,83,500,127" preferredShapeType="SECurveShape" subject="yr2uHuyCiu1SNxJW" xmi:id="yr2uHuyCiu1SNxJV">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<captionBounds value="0,0,40,40"/>
+					<captionInternalWidth value="-2147483648"/>
+					<captionInternalHeight value="-2147483648"/>
+					<captionVisible value="false"/>
+					<captionSide value="7"/>
+					<properties>
+						<abackground value="Cr:255,255,192,127"/>
+						<aforeground value="Cr:192,192,192,255"/>
+						<azOrder value="23"/>
+						<aselectable value="true"/>
+						<arequestResetCaption value="false"/>
+						<arequestResetCaptionSize value="false"/>
+						<adisplayStereotypeIcon value="false"/>
+						<aoverrideAppearanceWithStereotypeIcon value="true"/>
+						<arequestSetSizeOption value="0"/>
+						<aparentConnectorHeaderLength value="40"/>
+						<aparentConnectorLineLength value="10"/>
+						<aconnectToPoint value="true"/>
+						<aparentConnectorDTheta value="0.0"/>
+						<aconnectionPointType value="2"/>
+						<amodelElementNameAlignment value="9"/>
+						<arequestDefaultSize value="false"/>
+						<arequestFitSize value="false"/>
+						<arequestFitSizeFromCenter value="false"/>
+						<aobjectId value="20"/>
+						<aobjectType value="9096"/>
+						<anotUseVisibleBounds value="false"/>
+						<aalpha value="1.0"/>
+						<arotateAngle value="0.0"/>
+						<anodeName value="VPCurveShape"/>
+						<aactConnector value="true"/>
+						<adrawBy value="3"/>
+					</properties>
+					<FontFormat fontColor="Cr:0,0,0,255">
+						<Font name="Dialog" size="11" style="0"/>
+					</FontFormat>
+					<Label location="Pt:560.0,146.49999999999997" text=""/>
+					<Label transparency="0" tx="0.0" ty="0.0" type="0">
+						<FillFormat renderStyle="1">
+							<AffineTransformMatrix>
+								<Matrix value="1.9999999999999976"/>
+								<Matrix value="0.0"/>
+								<Matrix value="0.0"/>
+								<Matrix value="0.8839285714285712"/>
+								<Matrix value="-323.999999999999"/>
+								<Matrix value="13.026785714285694"/>
+							</AffineTransformMatrix>
+							<Render color="Cr:0,0,0,255"/>
+						</FillFormat>
+					</Label>
+					<ShapeBasePoint point="Pt:560.0,146.5"/>
+					<Arrow endArrow="0" startArrow="0"/>
+					<LineFormat color="Cr:192,192,192,255" style="91" width="1.0">
+						<Stroke cap="0" dashPhase="0.0" join="0" miterlimit="10.0" type="0" width="1.0"/>
+					</LineFormat>
+					<FillFormat renderStyle="1">
+						<AffineTransformMatrix>
+							<Matrix value="1.9999999999999976"/>
+							<Matrix value="0.0"/>
+							<Matrix value="0.0"/>
+							<Matrix value="0.8839285714285712"/>
+							<Matrix value="-323.999999999999"/>
+							<Matrix value="13.026785714285694"/>
+						</AffineTransformMatrix>
+						<Render color="Cr:255,255,192,127"/>
+					</FillFormat>
+					<CurveList windingRule="1">
+						<Curves>
+							<Curve controlPoint1="Pt:442.0,97.0" controlPoint2="Pt:678.0,97.0" endPoint="Pt:796.0,97.0" objectId="1" startPoint="Pt:324.0,97.0"/>
+							<Curve controlPoint1="Pt:796.0,121.75" controlPoint2="Pt:796.0,171.25" endPoint="Pt:796.0,196.0" objectId="2" startPoint="Pt:796.0,97.0"/>
+							<Curve controlPoint1="Pt:678.0,196.0" controlPoint2="Pt:442.0,196.0" endPoint="Pt:324.0,196.0" objectId="3" startPoint="Pt:796.0,196.0"/>
+							<Curve controlPoint1="Pt:324.0,171.25" controlPoint2="Pt:324.0,121.75" endPoint="Pt:324.0,97.0" objectId="4" startPoint="Pt:324.0,196.0"/>
+						</Curves>
+					</CurveList>
+				</xmi:Extension>
+				<elementFill color1="Cr:255,255,192,127" color2="" style="1" transparency="50" type="1"/>
+				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
+				<elementLine color="Cr:192,192,192,255" style="1" transparency="0" weight="1.0"/>
+			</uml:DiagramElement>
+			<uml:DiagramElement geometry="718,71;718,83;" preferredShapeType="Anchor" subject="qlVuHuyCiu1SNxJg" xmi:id="qlVuHuyCiu1SNxJh">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<captionBounds value="708,77,20,0"/>
+					<captionInternalWidth value="-2147483648"/>
+					<captionInternalHeight value="-2147483648"/>
+					<captionVisible value="true"/>
+					<captionSide value="1"/>
+					<properties>
+						<abackground value="Cr:122,207,245,255"/>
+						<aforeground value="Cr:0,0,0,255"/>
+						<azOrder value="-1"/>
+						<acreatorDiagramType value="ClassDiagram"/>
+						<aselectable value="true"/>
+						<arequestResetCaption value="false"/>
+						<arequestResetCaptionSize value="false"/>
+						<aconnectorStyle value="3"/>
+						<aconnectorLineJumps value="4"/>
+						<aconnectorLabelOrientation value="4"/>
+						<afromShapeXDiff value="0"/>
+						<afromShapeYDiff value="0"/>
+						<atoShapeXDiff value="0"/>
+						<atoShapeYDiff value="0"/>
+						<afromConnectType value="0"/>
+						<atoConnectType value="0"/>
+						<auseFromShapeCenter value="true"/>
+						<auseToShapeCenter value="true"/>
+						<afromPinType value="1"/>
+						<atoPinType value="1"/>
+						<arequestRebuild value="false"/>
+						<ashowConnectorName value="2"/>
+						<apaintThroughLabel value="2"/>
+					</properties>
+				</xmi:Extension>
+				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
+				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
+			</uml:DiagramElement>
+			<uml:DiagramElement geometry="368,131;368,89;235,89;235,183;359,183;" preferredShapeType="Association" subject="pKq8nuyCiu1SNxPl" xmi:id="1Kq8nuyCiu1SNxPq">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<captionBounds value="182,72,67,14"/>
+					<captionInternalWidth value="-2147483648"/>
+					<captionInternalHeight value="-2147483648"/>
+					<captionVisible value="true"/>
+					<captionSide value="1"/>
+					<properties>
+						<abackground value="Cr:122,207,245,255"/>
+						<aforeground value="Cr:0,0,0,255"/>
+						<azOrder value="-1"/>
+						<acreatorDiagramType value="ClassDiagram"/>
+						<aselectable value="true"/>
+						<arequestResetCaption value="false"/>
+						<arequestResetCaptionSize value="false"/>
+						<aconnectorStyle value="3"/>
+						<aconnectorLineJumps value="4"/>
+						<aconnectorLabelOrientation value="4"/>
+						<afromShapeXDiff value="0"/>
+						<afromShapeYDiff value="0"/>
+						<atoShapeXDiff value="0"/>
+						<atoShapeYDiff value="0"/>
+						<afromConnectType value="0"/>
+						<atoConnectType value="0"/>
+						<auseFromShapeCenter value="true"/>
+						<auseToShapeCenter value="true"/>
+						<afromPinType value="1"/>
+						<atoPinType value="1"/>
+						<arequestRebuild value="false"/>
+						<ashowConnectorName value="2"/>
+						<apaintThroughLabel value="2"/>
+						<ahasRoleAShape value="false"/>
+						<ahasRoleBShape value="false"/>
+						<ashowMultiplicityConstraints value="false"/>
+						<ahasMultiplicityAShape value="false"/>
+						<ahasMultiplicityBShape value="false"/>
+						<a0SwDr value="false"/>
+						<ashowStereotypes value="true"/>
+						<ashowFromRoleName value="true"/>
+						<ashowToRoleName value="true"/>
+						<ashowFromMultiplicity value="true"/>
+						<ashowToMultiplicity value="true"/>
+						<ashowFromRoleVisibility value="true"/>
+						<ashowToRoleVisibility value="true"/>
+						<ashowAssociationEndPropertyStrings value="false"/>
+						<ahasAssociationEndPropertyStringsAShape value="false"/>
+						<ahasAssociationEndPropertyStringsBShape value="false"/>
+						<afromRoleInternalWidth value="-2147483648"/>
+						<afromRoleInternalHeight value="-2147483648"/>
+						<atoRoleInternalWidth value="-2147483648"/>
+						<atoRoleInternalHeight value="-2147483648"/>
+						<afromMultiplicityInternalWidth value="-2147483648"/>
+						<afromMultiplicityInternalHeight value="-2147483648"/>
+						<atoMultiplicityInternalWidth value="-2147483648"/>
+						<atoMultiplicityInternalHeight value="-2147483648"/>
+						<aassociationEndPropertyStringsAInternalWidth value="-2147483648"/>
+						<aassociationEndPropertyStringsAInternalHeight value="-2147483648"/>
+						<aassociationEndPropertyStringsBInternalWidth value="-2147483648"/>
+						<aassociationEndPropertyStringsBInternalHeight value="-2147483648"/>
+					</properties>
+				</xmi:Extension>
+				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
+				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
+			</uml:DiagramElement>
+			<uml:DiagramElement geometry="96,301,80,40" preferredShapeType="Class" subject="Ftn8nuyCiu1SNxQP" xmi:id="5tn8nuyCiu1SNxQO">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<captionBounds value="0,0,80,14"/>
 					<captionInternalWidth value="-2147483648"/>
 					<captionInternalHeight value="-2147483648"/>
 					<captionVisible value="true"/>
@@ -11027,7 +11726,7 @@
 					<properties>
 						<abackground value="Cr:192,192,192,255"/>
 						<aforeground value="Cr:0,0,0,255"/>
-						<azOrder value="3"/>
+						<azOrder value="0"/>
 						<acreatorDiagramType value="ClassDiagram"/>
 						<aselectable value="true"/>
 						<arequestResetCaption value="false"/>
@@ -11082,274 +11781,17 @@
 				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
 				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
 			</uml:DiagramElement>
-			<uml:DiagramElement geometry="450,290;333,380;" preferredShapeType="Generalization" subject="6eo0.uyCiu1SNwZp" xmi:id="6eo0.uyCiu1SNwZq">
-				<xmi:Extension extender="Visual Paradigm for UML">
-					<captionBounds value="382,330,20,0"/>
-					<captionInternalWidth value="-2147483648"/>
-					<captionInternalHeight value="-2147483648"/>
-					<captionVisible value="true"/>
-					<captionSide value="1"/>
-					<properties>
-						<abackground value="Cr:255,255,255,255"/>
-						<aforeground value="Cr:0,0,0,255"/>
-						<azOrder value="-1"/>
-						<acreatorDiagramType value="ClassDiagram"/>
-						<aselectable value="true"/>
-						<arequestResetCaption value="false"/>
-						<arequestResetCaptionSize value="false"/>
-						<aconnectorStyle value="3"/>
-						<aconnectorLineJumps value="4"/>
-						<aconnectorLabelOrientation value="4"/>
-						<afromShapeXDiff value="0"/>
-						<afromShapeYDiff value="0"/>
-						<atoShapeXDiff value="0"/>
-						<atoShapeYDiff value="0"/>
-						<afromConnectType value="0"/>
-						<atoConnectType value="0"/>
-						<auseFromShapeCenter value="true"/>
-						<auseToShapeCenter value="true"/>
-						<afromPinType value="1"/>
-						<atoPinType value="1"/>
-						<arequestRebuild value="false"/>
-						<ashowConnectorName value="2"/>
-						<apaintThroughLabel value="2"/>
-					</properties>
-				</xmi:Extension>
-				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
-				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
-			</uml:DiagramElement>
-			<uml:DiagramElement geometry="450,270;200,381;" preferredShapeType="Generalization" subject="cW40.uyCiu1SNwZt" xmi:id="8W40.uyCiu1SNwZu">
-				<xmi:Extension extender="Visual Paradigm for UML">
-					<captionBounds value="316,320,20,0"/>
-					<captionInternalWidth value="-2147483648"/>
-					<captionInternalHeight value="-2147483648"/>
-					<captionVisible value="true"/>
-					<captionSide value="1"/>
-					<properties>
-						<abackground value="Cr:255,255,255,255"/>
-						<aforeground value="Cr:0,0,0,255"/>
-						<azOrder value="-1"/>
-						<acreatorDiagramType value="ClassDiagram"/>
-						<aselectable value="true"/>
-						<arequestResetCaption value="false"/>
-						<arequestResetCaptionSize value="false"/>
-						<aconnectorStyle value="3"/>
-						<aconnectorLineJumps value="4"/>
-						<aconnectorLabelOrientation value="4"/>
-						<afromShapeXDiff value="0"/>
-						<afromShapeYDiff value="0"/>
-						<atoShapeXDiff value="0"/>
-						<atoShapeYDiff value="0"/>
-						<afromConnectType value="0"/>
-						<atoConnectType value="0"/>
-						<auseFromShapeCenter value="true"/>
-						<auseToShapeCenter value="true"/>
-						<afromPinType value="1"/>
-						<atoPinType value="1"/>
-						<arequestRebuild value="false"/>
-						<ashowConnectorName value="2"/>
-						<apaintThroughLabel value="2"/>
-					</properties>
-				</xmi:Extension>
-				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
-				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
-			</uml:DiagramElement>
-			<uml:DiagramElement geometry="299,170;299,379;" preferredShapeType="AssociationClass" subject="tqk0.uyCiu1SNwZx" xmi:id="tqk0.uyCiu1SNwZy">
-				<xmi:Extension extender="Visual Paradigm for UML">
-					<captionBounds value="314,288,20,0"/>
-					<captionInternalWidth value="-2147483648"/>
-					<captionInternalHeight value="-2147483648"/>
-					<captionVisible value="true"/>
-					<captionSide value="1"/>
-					<properties>
-						<abackground value="Cr:122,207,245,255"/>
-						<aforeground value="Cr:0,0,0,255"/>
-						<azOrder value="-1"/>
-						<aselectable value="true"/>
-						<arequestResetCaption value="false"/>
-						<arequestResetCaptionSize value="false"/>
-						<aconnectorStyle value="3"/>
-						<aconnectorLineJumps value="4"/>
-						<aconnectorLabelOrientation value="4"/>
-						<afromShapeXDiff value="0"/>
-						<afromShapeYDiff value="0"/>
-						<atoShapeXDiff value="0"/>
-						<atoShapeYDiff value="0"/>
-						<afromConnectType value="0"/>
-						<atoConnectType value="0"/>
-						<auseFromShapeCenter value="true"/>
-						<auseToShapeCenter value="true"/>
-						<afromPinType value="1"/>
-						<atoPinType value="1"/>
-						<arequestRebuild value="false"/>
-						<ashowConnectorName value="2"/>
-						<apaintThroughLabel value="2"/>
-					</properties>
-				</xmi:Extension>
-				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
-				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
-			</uml:DiagramElement>
-			<uml:DiagramElement geometry="274,180;178,380;" preferredShapeType="AssociationClass" subject="blc0.uyCiu1SNwZ3" xmi:id="7lc0.uyCiu1SNwZ4">
-				<xmi:Extension extender="Visual Paradigm for UML">
-					<captionBounds value="242,291,20,0"/>
-					<captionInternalWidth value="-2147483648"/>
-					<captionInternalHeight value="-2147483648"/>
-					<captionVisible value="true"/>
-					<captionSide value="1"/>
-					<properties>
-						<abackground value="Cr:122,207,245,255"/>
-						<aforeground value="Cr:0,0,0,255"/>
-						<azOrder value="-1"/>
-						<aselectable value="true"/>
-						<arequestResetCaption value="false"/>
-						<arequestResetCaptionSize value="false"/>
-						<aconnectorStyle value="3"/>
-						<aconnectorLineJumps value="4"/>
-						<aconnectorLabelOrientation value="4"/>
-						<afromShapeXDiff value="0"/>
-						<afromShapeYDiff value="0"/>
-						<atoShapeXDiff value="0"/>
-						<atoShapeYDiff value="0"/>
-						<afromConnectType value="0"/>
-						<atoConnectType value="0"/>
-						<auseFromShapeCenter value="true"/>
-						<auseToShapeCenter value="true"/>
-						<afromPinType value="1"/>
-						<atoPinType value="1"/>
-						<arequestRebuild value="false"/>
-						<ashowConnectorName value="2"/>
-						<apaintThroughLabel value="2"/>
-					</properties>
-				</xmi:Extension>
-				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
-				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
-			</uml:DiagramElement>
-			<uml:DiagramElement geometry="614,17,159,71" preferredShapeType="NOTE" subject="afB2HuyCiu1SNxHe" xmi:id="kb6uHuyCiu1SNxJN">
-				<xmi:Extension extender="Visual Paradigm for UML">
-					<captionBounds value="0,0,159,0"/>
-					<captionInternalWidth value="-2147483648"/>
-					<captionInternalHeight value="-2147483648"/>
-					<captionVisible value="true"/>
-					<captionSide value="12"/>
-					<properties>
-						<abackground value="Cr:255,255,192,127"/>
-						<aforeground value="Cr:0,0,0,255"/>
-						<azOrder value="0"/>
-						<aselectable value="true"/>
-						<arequestResetCaption value="false"/>
-						<arequestResetCaptionSize value="false"/>
-						<adisplayStereotypeIcon value="false"/>
-						<aoverrideAppearanceWithStereotypeIcon value="true"/>
-						<arequestSetSizeOption value="0"/>
-						<aparentConnectorHeaderLength value="40"/>
-						<aparentConnectorLineLength value="10"/>
-						<aconnectToPoint value="true"/>
-						<aparentConnectorDTheta value="0.0"/>
-						<aconnectionPointType value="2"/>
-						<amodelElementNameAlignment value="9"/>
-						<arequestDefaultSize value="false"/>
-						<arequestFitSize value="false"/>
-						<arequestFitSizeFromCenter value="false"/>
-						<aangle value="0"/>
-					</properties>
-				</xmi:Extension>
-				<elementFill color1="Cr:255,255,192,127" color2="" style="1" transparency="50" type="1"/>
-				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
-				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
-			</uml:DiagramElement>
-			<uml:DiagramElement geometry="310,71,264,140" preferredShapeType="SECurveShape" subject="yr2uHuyCiu1SNxJW" xmi:id="yr2uHuyCiu1SNxJV">
-				<xmi:Extension extender="Visual Paradigm for UML">
-					<captionBounds value="0,0,40,40"/>
-					<captionInternalWidth value="-2147483648"/>
-					<captionInternalHeight value="-2147483648"/>
-					<captionVisible value="false"/>
-					<captionSide value="7"/>
-					<properties>
-						<abackground value="Cr:255,255,192,127"/>
-						<aforeground value="Cr:192,192,192,255"/>
-						<azOrder value="21"/>
-						<aselectable value="true"/>
-						<arequestResetCaption value="false"/>
-						<arequestResetCaptionSize value="false"/>
-						<adisplayStereotypeIcon value="false"/>
-						<aoverrideAppearanceWithStereotypeIcon value="true"/>
-						<arequestSetSizeOption value="0"/>
-						<aparentConnectorHeaderLength value="40"/>
-						<aparentConnectorLineLength value="10"/>
-						<aconnectToPoint value="true"/>
-						<aparentConnectorDTheta value="0.0"/>
-						<aconnectionPointType value="2"/>
-						<amodelElementNameAlignment value="9"/>
-						<arequestDefaultSize value="false"/>
-						<arequestFitSize value="false"/>
-						<arequestFitSizeFromCenter value="false"/>
-						<aobjectId value="1"/>
-						<aobjectType value="9096"/>
-						<anotUseVisibleBounds value="false"/>
-						<aalpha value="1.0"/>
-						<arotateAngle value="0.0"/>
-						<anodeName value="VPCurveShape"/>
-						<aactConnector value="true"/>
-						<adrawBy value="3"/>
-					</properties>
-					<FontFormat fontColor="Cr:0,0,0,255">
-						<Font name="Dialog" size="11" style="0"/>
-					</FontFormat>
-					<Label location="Pt:442.00000000000006,141.0" text=""/>
-					<Label transparency="0" tx="0.0" ty="0.0" type="0">
-						<FillFormat renderStyle="1">
-							<AffineTransformMatrix>
-								<Matrix value="1.0"/>
-								<Matrix value="0.0"/>
-								<Matrix value="0.0"/>
-								<Matrix value="1.0"/>
-								<Matrix value="0.0"/>
-								<Matrix value="-10.0"/>
-							</AffineTransformMatrix>
-							<Render color="Cr:0,0,0,255"/>
-						</FillFormat>
-					</Label>
-					<ShapeBasePoint point="Pt:442.00000000000006,141.0"/>
-					<Arrow endArrow="0" startArrow="0"/>
-					<LineFormat color="Cr:192,192,192,255" style="91" width="1.0">
-						<Stroke cap="0" dashPhase="0.0" join="0" miterlimit="10.0" type="0" width="1.0"/>
-					</LineFormat>
-					<FillFormat renderStyle="1">
-						<AffineTransformMatrix>
-							<Matrix value="1.0"/>
-							<Matrix value="0.0"/>
-							<Matrix value="0.0"/>
-							<Matrix value="1.0"/>
-							<Matrix value="0.0"/>
-							<Matrix value="-10.0"/>
-						</AffineTransformMatrix>
-						<Render color="Cr:255,255,192,127"/>
-					</FillFormat>
-					<CurveList windingRule="1">
-						<Curves>
-							<Curve controlPoint1="Pt:383.0,85.0" controlPoint2="Pt:501.0,85.0" endPoint="Pt:560.0,85.0" objectId="1" startPoint="Pt:324.0,85.0"/>
-							<Curve controlPoint1="Pt:560.0,113.0" controlPoint2="Pt:560.0,169.0" endPoint="Pt:560.0,197.0" objectId="2" startPoint="Pt:560.0,85.0"/>
-							<Curve controlPoint1="Pt:501.0,197.0" controlPoint2="Pt:383.0,197.0" endPoint="Pt:324.0,197.0" objectId="3" startPoint="Pt:560.0,197.0"/>
-							<Curve controlPoint1="Pt:324.0,169.0" controlPoint2="Pt:324.0,113.0" endPoint="Pt:324.0,85.0" objectId="4" startPoint="Pt:324.0,197.0"/>
-						</Curves>
-					</CurveList>
-				</xmi:Extension>
-				<elementFill color1="Cr:255,255,192,127" color2="" style="1" transparency="50" type="1"/>
-				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
-				<elementLine color="Cr:192,192,192,255" style="1" transparency="0" weight="1.0"/>
-			</uml:DiagramElement>
-			<uml:DiagramElement geometry="614,88;574,125;" preferredShapeType="Anchor" subject="qlVuHuyCiu1SNxJg" xmi:id="qlVuHuyCiu1SNxJh">
-				<xmi:Extension extender="Visual Paradigm for UML">
-					<captionBounds value="584,106,20,0"/>
-					<captionInternalWidth value="-2147483648"/>
-					<captionInternalHeight value="-2147483648"/>
-					<captionVisible value="true"/>
-					<captionSide value="1"/>
-					<properties>
-						<abackground value="Cr:122,207,245,255"/>
-						<aforeground value="Cr:0,0,0,255"/>
-						<azOrder value="-1"/>
-						<acreatorDiagramType value="ClassDiagram"/>
+			<uml:DiagramElement geometry="244,183;176,301;" preferredShapeType="AssociationClass" subject="P7f8nuyCiu1SNxQU" xmi:id="v7f8nuyCiu1SNxQV">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<captionBounds value="220,262,20,0"/>
+					<captionInternalWidth value="-2147483648"/>
+					<captionInternalHeight value="-2147483648"/>
+					<captionVisible value="true"/>
+					<captionSide value="1"/>
+					<properties>
+						<abackground value="Cr:122,207,245,255"/>
+						<aforeground value="Cr:0,0,0,255"/>
+						<azOrder value="-1"/>
 						<aselectable value="true"/>
 						<arequestResetCaption value="false"/>
 						<arequestResetCaptionSize value="false"/>
@@ -11381,7 +11823,7 @@
 			<properties>
 				<apmAuthor value="lavm"/>
 				<apmCreateDateTime value="1337357128123"/>
-				<apmLastModified value="1337636273600"/>
+				<apmLastModified value="1337876925227"/>
 				<ashowPackageNameStyle value="0"/>
 				<ashowConnectorName value="0"/>
 				<apaintConnectorThroughLabel value="0"/>
@@ -11499,7 +11941,7 @@
 				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
 				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
 			</uml:DiagramElement>
-			<uml:DiagramElement geometry="400,130,80,80" preferredShapeType="Class" subject="vTljmuyEwTiAAgLp" xmi:id="MS1NBuyCiu1SNweP">
+			<uml:DiagramElement geometry="400,130,80,70" preferredShapeType="Class" subject="vTljmuyEwTiAAgLp" xmi:id="MS1NBuyCiu1SNweP">
 				<xmi:Extension extender="Visual Paradigm for UML">
 					<captionBounds value="0,0,80,14"/>
 					<captionInternalWidth value="-2147483648"/>
@@ -11509,7 +11951,7 @@
 					<properties>
 						<abackground value="Cr:122,207,245,255"/>
 						<aforeground value="Cr:0,0,0,255"/>
-						<azOrder value="3"/>
+						<azOrder value="2"/>
 						<aselectable value="true"/>
 						<arequestResetCaption value="false"/>
 						<arequestResetCaptionSize value="false"/>
@@ -11819,9 +12261,9 @@
 				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
 				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
 			</uml:DiagramElement>
-			<uml:DiagramElement geometry="400,209;250,291;" preferredShapeType="Association" subject="Uf5tBuyCiu1SNwgY" xmi:id="0f5tBuyCiu1SNwgd">
-				<xmi:Extension extender="Visual Paradigm for UML">
-					<captionBounds value="320,260,121,14"/>
+			<uml:DiagramElement geometry="400,200;250,290;" preferredShapeType="Association" subject="Uf5tBuyCiu1SNwgY" xmi:id="0f5tBuyCiu1SNwgd">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<captionBounds value="320,252,121,14"/>
 					<captionInternalWidth value="-2147483648"/>
 					<captionInternalHeight value="-2147483648"/>
 					<captionVisible value="true"/>
@@ -11885,7 +12327,7 @@
 			</uml:DiagramElement>
 			<uml:DiagramElement geometry="210,129;210,90;120,90;120,150;169,150;" preferredShapeType="Association" subject="CNrtBuyCiu1SNwgz" xmi:id="CNrtBuyCiu1SNwg4">
 				<xmi:Extension extender="Visual Paradigm for UML">
-					<captionBounds value="115,58,108,14"/>
+					<captionBounds value="110,60,108,14"/>
 					<captionInternalWidth value="-2147483648"/>
 					<captionInternalHeight value="-2147483648"/>
 					<captionVisible value="true"/>
@@ -12011,389 +12453,9 @@
 				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
 				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
 			</uml:DiagramElement>
-		</uml:Diagram.element>
-	</uml:Diagram>
-	<uml:Diagram diagramType="ClassDiagram" documentation="" name="Component2" toolName="Visual Paradigm for UML" xmi:id="LDLNBuyCiu1SNwex">
-		<xmi:Extension extender="Visual Paradigm for UML">
-			<properties>
-				<apmAuthor value="lavm"/>
-				<apmCreateDateTime value="1337357192244"/>
-				<apmLastModified value="1337756030482"/>
-				<ashowPackageNameStyle value="0"/>
-				<ashowConnectorName value="0"/>
-				<apaintConnectorThroughLabel value="0"/>
-				<ashowActivityStateNodeCaption value="65535"/>
-				<aeditable value="true"/>
-				<afollowDiagramParentElement value="true"/>
-				<aautoFitShapesSize value="false"/>
-				<ashowTaggedValues value="false"/>
-				<ashowStereotypes value="true"/>
-				<ashowConstraints value="false"/>
-				<aalignToGrid value="false"/>
-				<agridVisible value="false"/>
-				<agridWidth value="10"/>
-				<agridHeight value="10"/>
-				<agridColor value="Cr:192,192,192,255"/>
-				<adiagramBackground value="Cr:255,255,255,255"/>
-				<aconnectorStyle value="1"/>
-				<aconnectorLineJumps value="0"/>
-				<aconnectorLineJumpsSize value="0"/>
-				<aconnectionPointStyle value="0"/>
-				<aconnectorLabelOrientation value="0"/>
-				<amodelElementNameAlignment value="4"/>
-				<azoomRatio value="1.0"/>
-				<amaximized value="false"/>
-				<ax value="0"/>
-				<ay value="0"/>
-				<awidth value="1235"/>
-				<aheight value="603"/>
-				<aqualityScore value="-1"/>
-				<aparentModel value="wzrNBuyCiu1SNwe3"/>
-				<a_globalPaletteOption value="true"/>
-				<a_alwaysShowReferenceAndSubdiagramResource value="false"/>
-				<ainitializeDiagramForCreate value="true"/>
-				<arequestValidateSnapToGrid value="false"/>
-				<ashowDefaultPackage value="true"/>
-				<adefaultPackage value="wzrNBuyCiu1SNwe3"/>
-				<ashowAttributeGetterSetter value="false"/>
-				<ashowClassOwner value="2"/>
-				<ashowPackageOwner value="2"/>
-				<ashowTemplateInfoOfGeneralizationAndRealization value="false"/>
-				<asuppressImplied1MultiplicityForAttributeAndAssociationEnd value="false"/>
-				<ashowClassEmptyCompartments value="2"/>
-				<ashowAttributesCodeDetails value="2"/>
-				<ashowAttributesType value="1"/>
-				<ashowOperationsParameters value="1"/>
-				<ashowOperationsReturnType value="1"/>
-				<ashowOperationsCodeDetails value="2"/>
-				<ashowParametersCodeDetails value="2"/>
-				<ashowEllipsisForUnshownClassMembers value="2"/>
-				<ageneralizationSetNotation value="2"/>
-			</properties>
-		</xmi:Extension>
-		<uml:Diagram.element>
-			<uml:DiagramElement geometry="370,140,80,50" preferredShapeType="Class" subject="2VbNBuyCiu1SNwe6" xmi:id="WVbNBuyCiu1SNwe5">
-				<xmi:Extension extender="Visual Paradigm for UML">
-					<captionBounds value="0,0,80,14"/>
-					<captionInternalWidth value="-2147483648"/>
-					<captionInternalHeight value="-2147483648"/>
-					<captionVisible value="true"/>
-					<captionSide value="12"/>
-					<properties>
-						<abackground value="Cr:122,207,245,255"/>
-						<aforeground value="Cr:0,0,0,255"/>
-						<azOrder value="14"/>
-						<acreatorDiagramType value="ClassDiagram"/>
-						<aselectable value="true"/>
-						<arequestResetCaption value="false"/>
-						<arequestResetCaptionSize value="false"/>
-						<adisplayStereotypeIcon value="false"/>
-						<aoverrideAppearanceWithStereotypeIcon value="true"/>
-						<arequestSetSizeOption value="0"/>
-						<aparentConnectorHeaderLength value="40"/>
-						<aparentConnectorLineLength value="10"/>
-						<aconnectToPoint value="true"/>
-						<aparentConnectorDTheta value="0.0"/>
-						<aconnectionPointType value="2"/>
-						<amodelElementNameAlignment value="9"/>
-						<arequestDefaultSize value="false"/>
-						<arequestFitSize value="false"/>
-						<arequestFitSizeFromCenter value="false"/>
-						<adisplayAsRobustnessAnalysisIcon value="true"/>
-						<avisibilityStyle value="1"/>
-						<ashowAttributeType value="1"/>
-						<ashowOperationType value="1"/>
-						<amSwTpPts value="true"/>
-						<alshRfAts value="true"/>
-						<amShDrAt value="false"/>
-						<akShDrOp value="false"/>
-						<akSwCsMbSt value="true"/>
-						<ashowClassMemberConstraints value="true"/>
-						<alShCmMl value="false"/>
-						<ashowOperationParameterDirection value="false"/>
-						<ashowOperationRaisedExceptions value="false"/>
-						<ashowParameterNameInOperationSignature value="true"/>
-						<ashowOperationTemplateParameters value="false"/>
-						<ashowOperationProperties value="false"/>
-						<awpMbs value="false"/>
-						<aattributeSortType value="0"/>
-						<aoperationSortType value="0"/>
-						<ashowInitialAttributeValue value="true"/>
-						<ashowOperationSignature value="true"/>
-						<ainterfaceBall value="false"/>
-						<ashowEmptyCompartments value="0"/>
-						<ashowEllipsisForUnshownMembers value="0"/>
-						<ashowAttributesCodeDetails value="0"/>
-						<ashowOperationsCodeDetails value="0"/>
-						<ashowParametersCodeDetails value="0"/>
-						<ashowTypeOption value="0"/>
-						<ashowOwnerOption value="3"/>
-						<ashowAttributesType value="0"/>
-						<ashowOperationsParameters value="0"/>
-						<ashowOperationsReturnType value="0"/>
-					</properties>
-				</xmi:Extension>
-				<elementFill color1="Cr:122,207,245,255" color2="" style="1" transparency="0" type="1"/>
-				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
-				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
-			</uml:DiagramElement>
-			<uml:DiagramElement geometry="140,140,80,80" preferredShapeType="Class" subject="vTljmuyEwTiAAgLp" xmi:id="ho2hzuyCiu1SNwwh">
-				<xmi:Extension extender="Visual Paradigm for UML">
-					<captionBounds value="0,0,80,14"/>
-					<captionInternalWidth value="-2147483648"/>
-					<captionInternalHeight value="-2147483648"/>
-					<captionVisible value="true"/>
-					<captionSide value="12"/>
-					<properties>
-						<abackground value="Cr:122,207,245,255"/>
-						<aforeground value="Cr:0,0,0,255"/>
-						<azOrder value="12"/>
-						<aselectable value="true"/>
-						<arequestResetCaption value="false"/>
-						<arequestResetCaptionSize value="false"/>
-						<adisplayStereotypeIcon value="false"/>
-						<aoverrideAppearanceWithStereotypeIcon value="true"/>
-						<arequestSetSizeOption value="0"/>
-						<aparentConnectorHeaderLength value="40"/>
-						<aparentConnectorLineLength value="10"/>
-						<aconnectToPoint value="true"/>
-						<aparentConnectorDTheta value="0.0"/>
-						<aconnectionPointType value="2"/>
-						<amodelElementNameAlignment value="9"/>
-						<arequestDefaultSize value="false"/>
-						<arequestFitSize value="false"/>
-						<arequestFitSizeFromCenter value="false"/>
-						<adisplayAsRobustnessAnalysisIcon value="true"/>
-						<avisibilityStyle value="1"/>
-						<ashowAttributeType value="1"/>
-						<ashowOperationType value="1"/>
-						<amSwTpPts value="true"/>
-						<alshRfAts value="true"/>
-						<amShDrAt value="false"/>
-						<akShDrOp value="false"/>
-						<akSwCsMbSt value="true"/>
-						<ashowClassMemberConstraints value="true"/>
-						<alShCmMl value="false"/>
-						<ashowOperationParameterDirection value="false"/>
-						<ashowOperationRaisedExceptions value="false"/>
-						<ashowParameterNameInOperationSignature value="true"/>
-						<ashowOperationTemplateParameters value="false"/>
-						<ashowOperationProperties value="false"/>
-						<awpMbs value="false"/>
-						<aattributeSortType value="0"/>
-						<aoperationSortType value="0"/>
-						<ashowInitialAttributeValue value="true"/>
-						<ashowOperationSignature value="true"/>
-						<ainterfaceBall value="false"/>
-						<ashowEmptyCompartments value="0"/>
-						<ashowEllipsisForUnshownMembers value="0"/>
-						<ashowAttributesCodeDetails value="0"/>
-						<ashowOperationsCodeDetails value="0"/>
-						<ashowParametersCodeDetails value="0"/>
-						<ashowTypeOption value="0"/>
-						<ashowOwnerOption value="3"/>
-						<ashowAttributesType value="0"/>
-						<ashowOperationsParameters value="0"/>
-						<ashowOperationsReturnType value="0"/>
-					</properties>
-				</xmi:Extension>
-				<elementFill color1="Cr:122,207,245,255" color2="" style="1" transparency="0" type="1"/>
-				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
-				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
-			</uml:DiagramElement>
-			<uml:DiagramElement geometry="220,170;369,170;" preferredShapeType="Association" subject="Uf5tBuyCiu1SNwgY" xmi:id="xo2hzuyCiu1SNwwj">
-				<xmi:Extension extender="Visual Paradigm for UML">
-					<captionBounds value="230,151,122,14"/>
-					<captionInternalWidth value="-2147483648"/>
-					<captionInternalHeight value="-2147483648"/>
-					<captionVisible value="true"/>
-					<captionSide value="1"/>
-					<properties>
-						<abackground value="Cr:122,207,245,255"/>
-						<aforeground value="Cr:0,0,0,255"/>
-						<azOrder value="-1"/>
-						<aselectable value="true"/>
-						<arequestResetCaption value="false"/>
-						<arequestResetCaptionSize value="false"/>
-						<aconnectorStyle value="3"/>
-						<aconnectorLineJumps value="4"/>
-						<aconnectorLabelOrientation value="4"/>
-						<afromShapeXDiff value="0"/>
-						<afromShapeYDiff value="0"/>
-						<atoShapeXDiff value="0"/>
-						<atoShapeYDiff value="0"/>
-						<afromConnectType value="0"/>
-						<atoConnectType value="0"/>
-						<auseFromShapeCenter value="true"/>
-						<auseToShapeCenter value="true"/>
-						<afromPinType value="1"/>
-						<atoPinType value="1"/>
-						<arequestRebuild value="false"/>
-						<ashowConnectorName value="2"/>
-						<apaintThroughLabel value="2"/>
-						<ahasRoleAShape value="false"/>
-						<ahasRoleBShape value="false"/>
-						<ashowMultiplicityConstraints value="false"/>
-						<ahasMultiplicityAShape value="false"/>
-						<ahasMultiplicityBShape value="false"/>
-						<a0SwDr value="false"/>
-						<ashowStereotypes value="true"/>
-						<ashowFromRoleName value="true"/>
-						<ashowToRoleName value="true"/>
-						<ashowFromMultiplicity value="true"/>
-						<ashowToMultiplicity value="true"/>
-						<ashowFromRoleVisibility value="true"/>
-						<ashowToRoleVisibility value="true"/>
-						<ashowAssociationEndPropertyStrings value="false"/>
-						<ahasAssociationEndPropertyStringsAShape value="false"/>
-						<ahasAssociationEndPropertyStringsBShape value="false"/>
-						<afromRoleInternalWidth value="-2147483648"/>
-						<afromRoleInternalHeight value="-2147483648"/>
-						<atoRoleInternalWidth value="-2147483648"/>
-						<atoRoleInternalHeight value="-2147483648"/>
-						<afromMultiplicityInternalWidth value="-2147483648"/>
-						<afromMultiplicityInternalHeight value="-2147483648"/>
-						<atoMultiplicityInternalWidth value="-2147483648"/>
-						<atoMultiplicityInternalHeight value="-2147483648"/>
-						<aassociationEndPropertyStringsAInternalWidth value="-2147483648"/>
-						<aassociationEndPropertyStringsAInternalHeight value="-2147483648"/>
-						<aassociationEndPropertyStringsBInternalWidth value="-2147483648"/>
-						<aassociationEndPropertyStringsBInternalHeight value="-2147483648"/>
-					</properties>
-				</xmi:Extension>
-				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
-				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
-			</uml:DiagramElement>
-			<uml:DiagramElement geometry="640,140,80,50" preferredShapeType="Class" subject="m6xjmuyEwTiAAgLk" xmi:id="XmhhzuyCiu1SNwwx">
-				<xmi:Extension extender="Visual Paradigm for UML">
-					<captionBounds value="0,0,80,14"/>
-					<captionInternalWidth value="-2147483648"/>
-					<captionInternalHeight value="-2147483648"/>
-					<captionVisible value="true"/>
-					<captionSide value="12"/>
-					<properties>
-						<abackground value="Cr:122,207,245,255"/>
-						<aforeground value="Cr:0,0,0,255"/>
-						<azOrder value="10"/>
-						<aselectable value="true"/>
-						<arequestResetCaption value="false"/>
-						<arequestResetCaptionSize value="false"/>
-						<adisplayStereotypeIcon value="false"/>
-						<aoverrideAppearanceWithStereotypeIcon value="true"/>
-						<arequestSetSizeOption value="0"/>
-						<aparentConnectorHeaderLength value="40"/>
-						<aparentConnectorLineLength value="10"/>
-						<aconnectToPoint value="true"/>
-						<aparentConnectorDTheta value="0.0"/>
-						<aconnectionPointType value="2"/>
-						<amodelElementNameAlignment value="9"/>
-						<arequestDefaultSize value="false"/>
-						<arequestFitSize value="false"/>
-						<arequestFitSizeFromCenter value="false"/>
-						<adisplayAsRobustnessAnalysisIcon value="true"/>
-						<avisibilityStyle value="1"/>
-						<ashowAttributeType value="1"/>
-						<ashowOperationType value="1"/>
-						<amSwTpPts value="true"/>
-						<alshRfAts value="true"/>
-						<amShDrAt value="false"/>
-						<akShDrOp value="false"/>
-						<akSwCsMbSt value="true"/>
-						<ashowClassMemberConstraints value="true"/>
-						<alShCmMl value="false"/>
-						<ashowOperationParameterDirection value="false"/>
-						<ashowOperationRaisedExceptions value="false"/>
-						<ashowParameterNameInOperationSignature value="true"/>
-						<ashowOperationTemplateParameters value="false"/>
-						<ashowOperationProperties value="false"/>
-						<awpMbs value="false"/>
-						<aattributeSortType value="0"/>
-						<aoperationSortType value="0"/>
-						<ashowInitialAttributeValue value="true"/>
-						<ashowOperationSignature value="true"/>
-						<ainterfaceBall value="false"/>
-						<ashowEmptyCompartments value="0"/>
-						<ashowEllipsisForUnshownMembers value="0"/>
-						<ashowAttributesCodeDetails value="0"/>
-						<ashowOperationsCodeDetails value="0"/>
-						<ashowParametersCodeDetails value="0"/>
-						<ashowTypeOption value="0"/>
-						<ashowOwnerOption value="3"/>
-						<ashowAttributesType value="0"/>
-						<ashowOperationsParameters value="0"/>
-						<ashowOperationsReturnType value="0"/>
-					</properties>
-				</xmi:Extension>
-				<elementFill color1="Cr:122,207,245,255" color2="" style="1" transparency="0" type="1"/>
-				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
-				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
-			</uml:DiagramElement>
-			<uml:DiagramElement geometry="639,160;450,160;" preferredShapeType="Association" subject="6.htBuyCiu1SNwgL" xmi:id="PmhhzuyCiu1SNww3">
-				<xmi:Extension extender="Visual Paradigm for UML">
-					<captionBounds value="488,143,108,14"/>
-					<captionInternalWidth value="-2147483648"/>
-					<captionInternalHeight value="-2147483648"/>
-					<captionVisible value="true"/>
-					<captionSide value="1"/>
-					<properties>
-						<abackground value="Cr:122,207,245,255"/>
-						<aforeground value="Cr:0,0,0,255"/>
-						<azOrder value="-1"/>
-						<aselectable value="true"/>
-						<arequestResetCaption value="false"/>
-						<arequestResetCaptionSize value="false"/>
-						<aconnectorStyle value="3"/>
-						<aconnectorLineJumps value="4"/>
-						<aconnectorLabelOrientation value="4"/>
-						<afromShapeXDiff value="0"/>
-						<afromShapeYDiff value="0"/>
-						<atoShapeXDiff value="0"/>
-						<atoShapeYDiff value="0"/>
-						<afromConnectType value="0"/>
-						<atoConnectType value="0"/>
-						<auseFromShapeCenter value="true"/>
-						<auseToShapeCenter value="true"/>
-						<afromPinType value="1"/>
-						<atoPinType value="1"/>
-						<arequestRebuild value="false"/>
-						<ashowConnectorName value="2"/>
-						<apaintThroughLabel value="2"/>
-						<ahasRoleAShape value="false"/>
-						<ahasRoleBShape value="false"/>
-						<ashowMultiplicityConstraints value="false"/>
-						<ahasMultiplicityAShape value="false"/>
-						<ahasMultiplicityBShape value="false"/>
-						<a0SwDr value="false"/>
-						<ashowStereotypes value="true"/>
-						<ashowFromRoleName value="true"/>
-						<ashowToRoleName value="true"/>
-						<ashowFromMultiplicity value="true"/>
-						<ashowToMultiplicity value="true"/>
-						<ashowFromRoleVisibility value="true"/>
-						<ashowToRoleVisibility value="true"/>
-						<ashowAssociationEndPropertyStrings value="false"/>
-						<ahasAssociationEndPropertyStringsAShape value="false"/>
-						<ahasAssociationEndPropertyStringsBShape value="false"/>
-						<afromRoleInternalWidth value="-2147483648"/>
-						<afromRoleInternalHeight value="-2147483648"/>
-						<atoRoleInternalWidth value="-2147483648"/>
-						<atoRoleInternalHeight value="-2147483648"/>
-						<afromMultiplicityInternalWidth value="-2147483648"/>
-						<afromMultiplicityInternalHeight value="-2147483648"/>
-						<atoMultiplicityInternalWidth value="-2147483648"/>
-						<atoMultiplicityInternalHeight value="-2147483648"/>
-						<aassociationEndPropertyStringsAInternalWidth value="-2147483648"/>
-						<aassociationEndPropertyStringsAInternalHeight value="-2147483648"/>
-						<aassociationEndPropertyStringsBInternalWidth value="-2147483648"/>
-						<aassociationEndPropertyStringsBInternalHeight value="-2147483648"/>
-					</properties>
-				</xmi:Extension>
-				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
-				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
-			</uml:DiagramElement>
-			<uml:DiagramElement geometry="420,190;420,230;490,230;490,180;450,180;" preferredShapeType="Association" subject="uYgRzuyCiu1SNwyI" xmi:id="eYgRzuyCiu1SNwyN">
-				<xmi:Extension extender="Visual Paradigm for UML">
-					<captionBounds value="320,210,110,14"/>
+			<uml:DiagramElement geometry="440,129;440,90;520,90;520,170;480,170;" preferredShapeType="Association" subject="1MC5_uyCiu1SNxbJ" xmi:id="1MC5_uyCiu1SNxbO">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<captionBounds value="430,60,102,14"/>
 					<captionInternalWidth value="-2147483648"/>
 					<captionInternalHeight value="-2147483648"/>
 					<captionVisible value="true"/>
@@ -12455,7 +12517,451 @@
 				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
 				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
 			</uml:DiagramElement>
-			<uml:DiagramElement geometry="200,310,130,50" preferredShapeType="Class" subject="WdORzuyCiu1SNwzI" xmi:id="WdORzuyCiu1SNwzH">
+		</uml:Diagram.element>
+	</uml:Diagram>
+	<uml:Diagram diagramType="ClassDiagram" documentation="" name="Component2" toolName="Visual Paradigm for UML" xmi:id="LDLNBuyCiu1SNwex">
+		<xmi:Extension extender="Visual Paradigm for UML">
+			<properties>
+				<apmAuthor value="lavm"/>
+				<apmCreateDateTime value="1337357192244"/>
+				<apmLastModified value="1337877056226"/>
+				<ashowPackageNameStyle value="0"/>
+				<ashowConnectorName value="0"/>
+				<apaintConnectorThroughLabel value="0"/>
+				<ashowActivityStateNodeCaption value="65535"/>
+				<aeditable value="true"/>
+				<afollowDiagramParentElement value="true"/>
+				<aautoFitShapesSize value="false"/>
+				<ashowTaggedValues value="false"/>
+				<ashowStereotypes value="true"/>
+				<ashowConstraints value="false"/>
+				<aalignToGrid value="false"/>
+				<agridVisible value="false"/>
+				<agridWidth value="10"/>
+				<agridHeight value="10"/>
+				<agridColor value="Cr:192,192,192,255"/>
+				<adiagramBackground value="Cr:255,255,255,255"/>
+				<aconnectorStyle value="1"/>
+				<aconnectorLineJumps value="0"/>
+				<aconnectorLineJumpsSize value="0"/>
+				<aconnectionPointStyle value="0"/>
+				<aconnectorLabelOrientation value="0"/>
+				<amodelElementNameAlignment value="4"/>
+				<azoomRatio value="1.0"/>
+				<amaximized value="false"/>
+				<ax value="0"/>
+				<ay value="0"/>
+				<awidth value="1235"/>
+				<aheight value="603"/>
+				<aqualityScore value="-1"/>
+				<aparentModel value="wzrNBuyCiu1SNwe3"/>
+				<a_globalPaletteOption value="true"/>
+				<a_alwaysShowReferenceAndSubdiagramResource value="false"/>
+				<ainitializeDiagramForCreate value="true"/>
+				<arequestValidateSnapToGrid value="false"/>
+				<ashowDefaultPackage value="true"/>
+				<adefaultPackage value="wzrNBuyCiu1SNwe3"/>
+				<ashowAttributeGetterSetter value="false"/>
+				<ashowClassOwner value="2"/>
+				<ashowPackageOwner value="2"/>
+				<ashowTemplateInfoOfGeneralizationAndRealization value="false"/>
+				<asuppressImplied1MultiplicityForAttributeAndAssociationEnd value="false"/>
+				<ashowClassEmptyCompartments value="2"/>
+				<ashowAttributesCodeDetails value="2"/>
+				<ashowAttributesType value="1"/>
+				<ashowOperationsParameters value="1"/>
+				<ashowOperationsReturnType value="1"/>
+				<ashowOperationsCodeDetails value="2"/>
+				<ashowParametersCodeDetails value="2"/>
+				<ashowEllipsisForUnshownClassMembers value="2"/>
+				<ageneralizationSetNotation value="2"/>
+			</properties>
+		</xmi:Extension>
+		<uml:Diagram.element>
+			<uml:DiagramElement geometry="370,68,80,50" preferredShapeType="Class" subject="2VbNBuyCiu1SNwe6" xmi:id="WVbNBuyCiu1SNwe5">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<captionBounds value="0,0,80,14"/>
+					<captionInternalWidth value="-2147483648"/>
+					<captionInternalHeight value="-2147483648"/>
+					<captionVisible value="true"/>
+					<captionSide value="12"/>
+					<properties>
+						<abackground value="Cr:122,207,245,255"/>
+						<aforeground value="Cr:0,0,0,255"/>
+						<azOrder value="20"/>
+						<acreatorDiagramType value="ClassDiagram"/>
+						<aselectable value="true"/>
+						<arequestResetCaption value="false"/>
+						<arequestResetCaptionSize value="false"/>
+						<adisplayStereotypeIcon value="false"/>
+						<aoverrideAppearanceWithStereotypeIcon value="true"/>
+						<arequestSetSizeOption value="0"/>
+						<aparentConnectorHeaderLength value="40"/>
+						<aparentConnectorLineLength value="10"/>
+						<aconnectToPoint value="true"/>
+						<aparentConnectorDTheta value="0.0"/>
+						<aconnectionPointType value="2"/>
+						<amodelElementNameAlignment value="9"/>
+						<arequestDefaultSize value="false"/>
+						<arequestFitSize value="false"/>
+						<arequestFitSizeFromCenter value="false"/>
+						<adisplayAsRobustnessAnalysisIcon value="true"/>
+						<avisibilityStyle value="1"/>
+						<ashowAttributeType value="1"/>
+						<ashowOperationType value="1"/>
+						<amSwTpPts value="true"/>
+						<alshRfAts value="true"/>
+						<amShDrAt value="false"/>
+						<akShDrOp value="false"/>
+						<akSwCsMbSt value="true"/>
+						<ashowClassMemberConstraints value="true"/>
+						<alShCmMl value="false"/>
+						<ashowOperationParameterDirection value="false"/>
+						<ashowOperationRaisedExceptions value="false"/>
+						<ashowParameterNameInOperationSignature value="true"/>
+						<ashowOperationTemplateParameters value="false"/>
+						<ashowOperationProperties value="false"/>
+						<awpMbs value="false"/>
+						<aattributeSortType value="0"/>
+						<aoperationSortType value="0"/>
+						<ashowInitialAttributeValue value="true"/>
+						<ashowOperationSignature value="true"/>
+						<ainterfaceBall value="false"/>
+						<ashowEmptyCompartments value="0"/>
+						<ashowEllipsisForUnshownMembers value="0"/>
+						<ashowAttributesCodeDetails value="0"/>
+						<ashowOperationsCodeDetails value="0"/>
+						<ashowParametersCodeDetails value="0"/>
+						<ashowTypeOption value="0"/>
+						<ashowOwnerOption value="3"/>
+						<ashowAttributesType value="0"/>
+						<ashowOperationsParameters value="0"/>
+						<ashowOperationsReturnType value="0"/>
+					</properties>
+				</xmi:Extension>
+				<elementFill color1="Cr:122,207,245,255" color2="" style="1" transparency="0" type="1"/>
+				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
+				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
+			</uml:DiagramElement>
+			<uml:DiagramElement geometry="140,68,80,78" preferredShapeType="Class" subject="vTljmuyEwTiAAgLp" xmi:id="ho2hzuyCiu1SNwwh">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<captionBounds value="0,0,80,14"/>
+					<captionInternalWidth value="-2147483648"/>
+					<captionInternalHeight value="-2147483648"/>
+					<captionVisible value="true"/>
+					<captionSide value="12"/>
+					<properties>
+						<abackground value="Cr:122,207,245,255"/>
+						<aforeground value="Cr:0,0,0,255"/>
+						<azOrder value="18"/>
+						<aselectable value="true"/>
+						<arequestResetCaption value="false"/>
+						<arequestResetCaptionSize value="false"/>
+						<adisplayStereotypeIcon value="false"/>
+						<aoverrideAppearanceWithStereotypeIcon value="true"/>
+						<arequestSetSizeOption value="0"/>
+						<aparentConnectorHeaderLength value="40"/>
+						<aparentConnectorLineLength value="10"/>
+						<aconnectToPoint value="true"/>
+						<aparentConnectorDTheta value="0.0"/>
+						<aconnectionPointType value="2"/>
+						<amodelElementNameAlignment value="9"/>
+						<arequestDefaultSize value="false"/>
+						<arequestFitSize value="false"/>
+						<arequestFitSizeFromCenter value="false"/>
+						<adisplayAsRobustnessAnalysisIcon value="true"/>
+						<avisibilityStyle value="1"/>
+						<ashowAttributeType value="1"/>
+						<ashowOperationType value="1"/>
+						<amSwTpPts value="true"/>
+						<alshRfAts value="true"/>
+						<amShDrAt value="false"/>
+						<akShDrOp value="false"/>
+						<akSwCsMbSt value="true"/>
+						<ashowClassMemberConstraints value="true"/>
+						<alShCmMl value="false"/>
+						<ashowOperationParameterDirection value="false"/>
+						<ashowOperationRaisedExceptions value="false"/>
+						<ashowParameterNameInOperationSignature value="true"/>
+						<ashowOperationTemplateParameters value="false"/>
+						<ashowOperationProperties value="false"/>
+						<awpMbs value="false"/>
+						<aattributeSortType value="0"/>
+						<aoperationSortType value="0"/>
+						<ashowInitialAttributeValue value="true"/>
+						<ashowOperationSignature value="true"/>
+						<ainterfaceBall value="false"/>
+						<ashowEmptyCompartments value="0"/>
+						<ashowEllipsisForUnshownMembers value="0"/>
+						<ashowAttributesCodeDetails value="0"/>
+						<ashowOperationsCodeDetails value="0"/>
+						<ashowParametersCodeDetails value="0"/>
+						<ashowTypeOption value="0"/>
+						<ashowOwnerOption value="3"/>
+						<ashowAttributesType value="0"/>
+						<ashowOperationsParameters value="0"/>
+						<ashowOperationsReturnType value="0"/>
+					</properties>
+				</xmi:Extension>
+				<elementFill color1="Cr:122,207,245,255" color2="" style="1" transparency="0" type="1"/>
+				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
+				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
+			</uml:DiagramElement>
+			<uml:DiagramElement geometry="220,98;369,98;" preferredShapeType="Association" subject="Uf5tBuyCiu1SNwgY" xmi:id="xo2hzuyCiu1SNwwj">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<captionBounds value="230,79,122,14"/>
+					<captionInternalWidth value="-2147483648"/>
+					<captionInternalHeight value="-2147483648"/>
+					<captionVisible value="true"/>
+					<captionSide value="1"/>
+					<properties>
+						<abackground value="Cr:122,207,245,255"/>
+						<aforeground value="Cr:0,0,0,255"/>
+						<azOrder value="-1"/>
+						<aselectable value="true"/>
+						<arequestResetCaption value="false"/>
+						<arequestResetCaptionSize value="false"/>
+						<aconnectorStyle value="3"/>
+						<aconnectorLineJumps value="4"/>
+						<aconnectorLabelOrientation value="4"/>
+						<afromShapeXDiff value="0"/>
+						<afromShapeYDiff value="0"/>
+						<atoShapeXDiff value="0"/>
+						<atoShapeYDiff value="0"/>
+						<afromConnectType value="0"/>
+						<atoConnectType value="0"/>
+						<auseFromShapeCenter value="true"/>
+						<auseToShapeCenter value="true"/>
+						<afromPinType value="1"/>
+						<atoPinType value="1"/>
+						<arequestRebuild value="false"/>
+						<ashowConnectorName value="2"/>
+						<apaintThroughLabel value="2"/>
+						<ahasRoleAShape value="false"/>
+						<ahasRoleBShape value="false"/>
+						<ashowMultiplicityConstraints value="false"/>
+						<ahasMultiplicityAShape value="false"/>
+						<ahasMultiplicityBShape value="false"/>
+						<a0SwDr value="false"/>
+						<ashowStereotypes value="true"/>
+						<ashowFromRoleName value="true"/>
+						<ashowToRoleName value="true"/>
+						<ashowFromMultiplicity value="true"/>
+						<ashowToMultiplicity value="true"/>
+						<ashowFromRoleVisibility value="true"/>
+						<ashowToRoleVisibility value="true"/>
+						<ashowAssociationEndPropertyStrings value="false"/>
+						<ahasAssociationEndPropertyStringsAShape value="false"/>
+						<ahasAssociationEndPropertyStringsBShape value="false"/>
+						<afromRoleInternalWidth value="-2147483648"/>
+						<afromRoleInternalHeight value="-2147483648"/>
+						<atoRoleInternalWidth value="-2147483648"/>
+						<atoRoleInternalHeight value="-2147483648"/>
+						<afromMultiplicityInternalWidth value="-2147483648"/>
+						<afromMultiplicityInternalHeight value="-2147483648"/>
+						<atoMultiplicityInternalWidth value="-2147483648"/>
+						<atoMultiplicityInternalHeight value="-2147483648"/>
+						<aassociationEndPropertyStringsAInternalWidth value="-2147483648"/>
+						<aassociationEndPropertyStringsAInternalHeight value="-2147483648"/>
+						<aassociationEndPropertyStringsBInternalWidth value="-2147483648"/>
+						<aassociationEndPropertyStringsBInternalHeight value="-2147483648"/>
+					</properties>
+				</xmi:Extension>
+				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
+				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
+			</uml:DiagramElement>
+			<uml:DiagramElement geometry="640,68,80,50" preferredShapeType="Class" subject="m6xjmuyEwTiAAgLk" xmi:id="XmhhzuyCiu1SNwwx">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<captionBounds value="0,0,80,14"/>
+					<captionInternalWidth value="-2147483648"/>
+					<captionInternalHeight value="-2147483648"/>
+					<captionVisible value="true"/>
+					<captionSide value="12"/>
+					<properties>
+						<abackground value="Cr:122,207,245,255"/>
+						<aforeground value="Cr:0,0,0,255"/>
+						<azOrder value="16"/>
+						<aselectable value="true"/>
+						<arequestResetCaption value="false"/>
+						<arequestResetCaptionSize value="false"/>
+						<adisplayStereotypeIcon value="false"/>
+						<aoverrideAppearanceWithStereotypeIcon value="true"/>
+						<arequestSetSizeOption value="0"/>
+						<aparentConnectorHeaderLength value="40"/>
+						<aparentConnectorLineLength value="10"/>
+						<aconnectToPoint value="true"/>
+						<aparentConnectorDTheta value="0.0"/>
+						<aconnectionPointType value="2"/>
+						<amodelElementNameAlignment value="9"/>
+						<arequestDefaultSize value="false"/>
+						<arequestFitSize value="false"/>
+						<arequestFitSizeFromCenter value="false"/>
+						<adisplayAsRobustnessAnalysisIcon value="true"/>
+						<avisibilityStyle value="1"/>
+						<ashowAttributeType value="1"/>
+						<ashowOperationType value="1"/>
+						<amSwTpPts value="true"/>
+						<alshRfAts value="true"/>
+						<amShDrAt value="false"/>
+						<akShDrOp value="false"/>
+						<akSwCsMbSt value="true"/>
+						<ashowClassMemberConstraints value="true"/>
+						<alShCmMl value="false"/>
+						<ashowOperationParameterDirection value="false"/>
+						<ashowOperationRaisedExceptions value="false"/>
+						<ashowParameterNameInOperationSignature value="true"/>
+						<ashowOperationTemplateParameters value="false"/>
+						<ashowOperationProperties value="false"/>
+						<awpMbs value="false"/>
+						<aattributeSortType value="0"/>
+						<aoperationSortType value="0"/>
+						<ashowInitialAttributeValue value="true"/>
+						<ashowOperationSignature value="true"/>
+						<ainterfaceBall value="false"/>
+						<ashowEmptyCompartments value="0"/>
+						<ashowEllipsisForUnshownMembers value="0"/>
+						<ashowAttributesCodeDetails value="0"/>
+						<ashowOperationsCodeDetails value="0"/>
+						<ashowParametersCodeDetails value="0"/>
+						<ashowTypeOption value="0"/>
+						<ashowOwnerOption value="3"/>
+						<ashowAttributesType value="0"/>
+						<ashowOperationsParameters value="0"/>
+						<ashowOperationsReturnType value="0"/>
+					</properties>
+				</xmi:Extension>
+				<elementFill color1="Cr:122,207,245,255" color2="" style="1" transparency="0" type="1"/>
+				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
+				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
+			</uml:DiagramElement>
+			<uml:DiagramElement geometry="639,88;450,88;" preferredShapeType="Association" subject="6.htBuyCiu1SNwgL" xmi:id="PmhhzuyCiu1SNww3">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<captionBounds value="488,71,108,14"/>
+					<captionInternalWidth value="-2147483648"/>
+					<captionInternalHeight value="-2147483648"/>
+					<captionVisible value="true"/>
+					<captionSide value="1"/>
+					<properties>
+						<abackground value="Cr:122,207,245,255"/>
+						<aforeground value="Cr:0,0,0,255"/>
+						<azOrder value="-1"/>
+						<aselectable value="true"/>
+						<arequestResetCaption value="false"/>
+						<arequestResetCaptionSize value="false"/>
+						<aconnectorStyle value="3"/>
+						<aconnectorLineJumps value="4"/>
+						<aconnectorLabelOrientation value="4"/>
+						<afromShapeXDiff value="0"/>
+						<afromShapeYDiff value="0"/>
+						<atoShapeXDiff value="0"/>
+						<atoShapeYDiff value="0"/>
+						<afromConnectType value="0"/>
+						<atoConnectType value="0"/>
+						<auseFromShapeCenter value="true"/>
+						<auseToShapeCenter value="true"/>
+						<afromPinType value="1"/>
+						<atoPinType value="1"/>
+						<arequestRebuild value="false"/>
+						<ashowConnectorName value="2"/>
+						<apaintThroughLabel value="2"/>
+						<ahasRoleAShape value="false"/>
+						<ahasRoleBShape value="false"/>
+						<ashowMultiplicityConstraints value="false"/>
+						<ahasMultiplicityAShape value="false"/>
+						<ahasMultiplicityBShape value="false"/>
+						<a0SwDr value="false"/>
+						<ashowStereotypes value="true"/>
+						<ashowFromRoleName value="true"/>
+						<ashowToRoleName value="true"/>
+						<ashowFromMultiplicity value="true"/>
+						<ashowToMultiplicity value="true"/>
+						<ashowFromRoleVisibility value="true"/>
+						<ashowToRoleVisibility value="true"/>
+						<ashowAssociationEndPropertyStrings value="false"/>
+						<ahasAssociationEndPropertyStringsAShape value="false"/>
+						<ahasAssociationEndPropertyStringsBShape value="false"/>
+						<afromRoleInternalWidth value="-2147483648"/>
+						<afromRoleInternalHeight value="-2147483648"/>
+						<atoRoleInternalWidth value="-2147483648"/>
+						<atoRoleInternalHeight value="-2147483648"/>
+						<afromMultiplicityInternalWidth value="-2147483648"/>
+						<afromMultiplicityInternalHeight value="-2147483648"/>
+						<atoMultiplicityInternalWidth value="-2147483648"/>
+						<atoMultiplicityInternalHeight value="-2147483648"/>
+						<aassociationEndPropertyStringsAInternalWidth value="-2147483648"/>
+						<aassociationEndPropertyStringsAInternalHeight value="-2147483648"/>
+						<aassociationEndPropertyStringsBInternalWidth value="-2147483648"/>
+						<aassociationEndPropertyStringsBInternalHeight value="-2147483648"/>
+					</properties>
+				</xmi:Extension>
+				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
+				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
+			</uml:DiagramElement>
+			<uml:DiagramElement geometry="420,118;420,158;490,158;490,108;450,108;" preferredShapeType="Association" subject="uYgRzuyCiu1SNwyI" xmi:id="eYgRzuyCiu1SNwyN">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<captionBounds value="457,160,110,14"/>
+					<captionInternalWidth value="-2147483648"/>
+					<captionInternalHeight value="-2147483648"/>
+					<captionVisible value="true"/>
+					<captionSide value="1"/>
+					<properties>
+						<abackground value="Cr:122,207,245,255"/>
+						<aforeground value="Cr:0,0,0,255"/>
+						<azOrder value="-1"/>
+						<acreatorDiagramType value="ClassDiagram"/>
+						<aselectable value="true"/>
+						<arequestResetCaption value="false"/>
+						<arequestResetCaptionSize value="false"/>
+						<aconnectorStyle value="3"/>
+						<aconnectorLineJumps value="4"/>
+						<aconnectorLabelOrientation value="4"/>
+						<afromShapeXDiff value="0"/>
+						<afromShapeYDiff value="0"/>
+						<atoShapeXDiff value="0"/>
+						<atoShapeYDiff value="0"/>
+						<afromConnectType value="0"/>
+						<atoConnectType value="0"/>
+						<auseFromShapeCenter value="true"/>
+						<auseToShapeCenter value="true"/>
+						<afromPinType value="1"/>
+						<atoPinType value="1"/>
+						<arequestRebuild value="false"/>
+						<ashowConnectorName value="2"/>
+						<apaintThroughLabel value="2"/>
+						<ahasRoleAShape value="false"/>
+						<ahasRoleBShape value="false"/>
+						<ashowMultiplicityConstraints value="false"/>
+						<ahasMultiplicityAShape value="false"/>
+						<ahasMultiplicityBShape value="false"/>
+						<a0SwDr value="false"/>
+						<ashowStereotypes value="true"/>
+						<ashowFromRoleName value="true"/>
+						<ashowToRoleName value="true"/>
+						<ashowFromMultiplicity value="true"/>
+						<ashowToMultiplicity value="true"/>
+						<ashowFromRoleVisibility value="true"/>
+						<ashowToRoleVisibility value="true"/>
+						<ashowAssociationEndPropertyStrings value="false"/>
+						<ahasAssociationEndPropertyStringsAShape value="false"/>
+						<ahasAssociationEndPropertyStringsBShape value="false"/>
+						<afromRoleInternalWidth value="-2147483648"/>
+						<afromRoleInternalHeight value="-2147483648"/>
+						<atoRoleInternalWidth value="-2147483648"/>
+						<atoRoleInternalHeight value="-2147483648"/>
+						<afromMultiplicityInternalWidth value="-2147483648"/>
+						<afromMultiplicityInternalHeight value="-2147483648"/>
+						<atoMultiplicityInternalWidth value="-2147483648"/>
+						<atoMultiplicityInternalHeight value="-2147483648"/>
+						<aassociationEndPropertyStringsAInternalWidth value="-2147483648"/>
+						<aassociationEndPropertyStringsAInternalHeight value="-2147483648"/>
+						<aassociationEndPropertyStringsBInternalWidth value="-2147483648"/>
+						<aassociationEndPropertyStringsBInternalHeight value="-2147483648"/>
+					</properties>
+				</xmi:Extension>
+				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
+				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
+			</uml:DiagramElement>
+			<uml:DiagramElement geometry="155,272,130,50" preferredShapeType="Class" subject="WdORzuyCiu1SNwzI" xmi:id="WdORzuyCiu1SNwzH">
 				<xmi:Extension extender="Visual Paradigm for UML">
 					<captionBounds value="0,0,130,14"/>
 					<captionInternalWidth value="-2147483648"/>
@@ -12465,6 +12971,435 @@
 					<properties>
 						<abackground value="Cr:192,192,192,255"/>
 						<aforeground value="Cr:0,0,0,255"/>
+						<azOrder value="14"/>
+						<acreatorDiagramType value="ClassDiagram"/>
+						<aselectable value="true"/>
+						<arequestResetCaption value="false"/>
+						<arequestResetCaptionSize value="false"/>
+						<adisplayStereotypeIcon value="false"/>
+						<aoverrideAppearanceWithStereotypeIcon value="true"/>
+						<arequestSetSizeOption value="0"/>
+						<aparentConnectorHeaderLength value="40"/>
+						<aparentConnectorLineLength value="10"/>
+						<aconnectToPoint value="true"/>
+						<aparentConnectorDTheta value="0.0"/>
+						<aconnectionPointType value="2"/>
+						<amodelElementNameAlignment value="9"/>
+						<arequestDefaultSize value="false"/>
+						<arequestFitSize value="false"/>
+						<arequestFitSizeFromCenter value="false"/>
+						<adisplayAsRobustnessAnalysisIcon value="true"/>
+						<avisibilityStyle value="1"/>
+						<ashowAttributeType value="1"/>
+						<ashowOperationType value="1"/>
+						<amSwTpPts value="true"/>
+						<alshRfAts value="true"/>
+						<amShDrAt value="false"/>
+						<akShDrOp value="false"/>
+						<akSwCsMbSt value="true"/>
+						<ashowClassMemberConstraints value="true"/>
+						<alShCmMl value="false"/>
+						<ashowOperationParameterDirection value="false"/>
+						<ashowOperationRaisedExceptions value="false"/>
+						<ashowParameterNameInOperationSignature value="true"/>
+						<ashowOperationTemplateParameters value="false"/>
+						<ashowOperationProperties value="false"/>
+						<awpMbs value="false"/>
+						<aattributeSortType value="0"/>
+						<aoperationSortType value="0"/>
+						<ashowInitialAttributeValue value="true"/>
+						<ashowOperationSignature value="true"/>
+						<ainterfaceBall value="false"/>
+						<ashowEmptyCompartments value="0"/>
+						<ashowEllipsisForUnshownMembers value="0"/>
+						<ashowAttributesCodeDetails value="0"/>
+						<ashowOperationsCodeDetails value="0"/>
+						<ashowParametersCodeDetails value="0"/>
+						<ashowTypeOption value="0"/>
+						<ashowOwnerOption value="3"/>
+						<ashowAttributesType value="0"/>
+						<ashowOperationsParameters value="0"/>
+						<ashowOperationsReturnType value="0"/>
+					</properties>
+				</xmi:Extension>
+				<elementFill color1="Cr:192,192,192,255" color2="" style="1" transparency="0" type="1"/>
+				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
+				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
+			</uml:DiagramElement>
+			<uml:DiagramElement geometry="263,98;263,271;" preferredShapeType="AssociationClass" subject="N.hRzuyCiu1SNwzM" xmi:id="N.hRzuyCiu1SNwzN">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<captionBounds value="273,208,20,0"/>
+					<captionInternalWidth value="-2147483648"/>
+					<captionInternalHeight value="-2147483648"/>
+					<captionVisible value="true"/>
+					<captionSide value="1"/>
+					<properties>
+						<abackground value="Cr:122,207,245,255"/>
+						<aforeground value="Cr:0,0,0,255"/>
+						<azOrder value="-1"/>
+						<aselectable value="true"/>
+						<arequestResetCaption value="false"/>
+						<arequestResetCaptionSize value="false"/>
+						<aconnectorStyle value="3"/>
+						<aconnectorLineJumps value="4"/>
+						<aconnectorLabelOrientation value="4"/>
+						<afromShapeXDiff value="0"/>
+						<afromShapeYDiff value="0"/>
+						<atoShapeXDiff value="0"/>
+						<atoShapeYDiff value="0"/>
+						<afromConnectType value="0"/>
+						<atoConnectType value="0"/>
+						<auseFromShapeCenter value="true"/>
+						<auseToShapeCenter value="true"/>
+						<afromPinType value="1"/>
+						<atoPinType value="1"/>
+						<arequestRebuild value="false"/>
+						<ashowConnectorName value="2"/>
+						<apaintThroughLabel value="2"/>
+					</properties>
+				</xmi:Extension>
+				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
+				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
+			</uml:DiagramElement>
+			<uml:DiagramElement geometry="636,275,105,40" preferredShapeType="Class" subject="CIdRzuyCiu1SNwzZ" xmi:id="8IdRzuyCiu1SNwzY">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<captionBounds value="0,0,105,28"/>
+					<captionInternalWidth value="-2147483648"/>
+					<captionInternalHeight value="-2147483648"/>
+					<captionVisible value="true"/>
+					<captionSide value="12"/>
+					<properties>
+						<abackground value="Cr:179,214,249,255"/>
+						<aforeground value="Cr:0,0,0,255"/>
+						<azOrder value="12"/>
+						<acreatorDiagramType value="ClassDiagram"/>
+						<aselectable value="true"/>
+						<arequestResetCaption value="false"/>
+						<arequestResetCaptionSize value="false"/>
+						<adisplayStereotypeIcon value="false"/>
+						<aoverrideAppearanceWithStereotypeIcon value="true"/>
+						<arequestSetSizeOption value="0"/>
+						<aparentConnectorHeaderLength value="40"/>
+						<aparentConnectorLineLength value="10"/>
+						<aconnectToPoint value="true"/>
+						<aparentConnectorDTheta value="0.0"/>
+						<aconnectionPointType value="2"/>
+						<amodelElementNameAlignment value="9"/>
+						<arequestDefaultSize value="false"/>
+						<arequestFitSize value="false"/>
+						<arequestFitSizeFromCenter value="false"/>
+						<adisplayAsRobustnessAnalysisIcon value="true"/>
+						<avisibilityStyle value="1"/>
+						<ashowAttributeType value="1"/>
+						<ashowOperationType value="1"/>
+						<amSwTpPts value="true"/>
+						<alshRfAts value="true"/>
+						<amShDrAt value="false"/>
+						<akShDrOp value="false"/>
+						<akSwCsMbSt value="true"/>
+						<ashowClassMemberConstraints value="true"/>
+						<alShCmMl value="false"/>
+						<ashowOperationParameterDirection value="false"/>
+						<ashowOperationRaisedExceptions value="false"/>
+						<ashowParameterNameInOperationSignature value="true"/>
+						<ashowOperationTemplateParameters value="false"/>
+						<ashowOperationProperties value="false"/>
+						<awpMbs value="false"/>
+						<aattributeSortType value="0"/>
+						<aoperationSortType value="0"/>
+						<ashowInitialAttributeValue value="true"/>
+						<ashowOperationSignature value="true"/>
+						<ainterfaceBall value="false"/>
+						<ashowEmptyCompartments value="0"/>
+						<ashowEllipsisForUnshownMembers value="0"/>
+						<ashowAttributesCodeDetails value="0"/>
+						<ashowOperationsCodeDetails value="0"/>
+						<ashowParametersCodeDetails value="0"/>
+						<ashowTypeOption value="0"/>
+						<ashowOwnerOption value="3"/>
+						<ashowAttributesType value="0"/>
+						<ashowOperationsParameters value="0"/>
+						<ashowOperationsReturnType value="0"/>
+					</properties>
+				</xmi:Extension>
+				<elementFill color1="Cr:179,214,249,255" color2="" style="1" transparency="0" type="1"/>
+				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
+				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
+			</uml:DiagramElement>
+			<uml:DiagramElement geometry="680,118;680,274;" preferredShapeType="Generalization" subject="cELRzuyCiu1SNwzd" xmi:id="cELRzuyCiu1SNwze">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<captionBounds value="680,195,20,0"/>
+					<captionInternalWidth value="-2147483648"/>
+					<captionInternalHeight value="-2147483648"/>
+					<captionVisible value="true"/>
+					<captionSide value="1"/>
+					<properties>
+						<abackground value="Cr:255,255,255,255"/>
+						<aforeground value="Cr:0,0,0,255"/>
+						<azOrder value="-1"/>
+						<acreatorDiagramType value="ClassDiagram"/>
+						<aselectable value="true"/>
+						<arequestResetCaption value="false"/>
+						<arequestResetCaptionSize value="false"/>
+						<aconnectorStyle value="3"/>
+						<aconnectorLineJumps value="4"/>
+						<aconnectorLabelOrientation value="4"/>
+						<afromShapeXDiff value="0"/>
+						<afromShapeYDiff value="0"/>
+						<atoShapeXDiff value="0"/>
+						<atoShapeYDiff value="0"/>
+						<afromConnectType value="0"/>
+						<atoConnectType value="0"/>
+						<auseFromShapeCenter value="true"/>
+						<auseToShapeCenter value="true"/>
+						<afromPinType value="1"/>
+						<atoPinType value="1"/>
+						<arequestRebuild value="false"/>
+						<ashowConnectorName value="2"/>
+						<apaintThroughLabel value="2"/>
+					</properties>
+				</xmi:Extension>
+				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
+				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
+			</uml:DiagramElement>
+			<uml:DiagramElement geometry="285,295;635,295;" preferredShapeType="Association" subject="tG7RzuyCiu1SNwzq" xmi:id="9G7RzuyCiu1SNwzv">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<captionBounds value="434,298,44,14"/>
+					<captionInternalWidth value="-2147483648"/>
+					<captionInternalHeight value="-2147483648"/>
+					<captionVisible value="true"/>
+					<captionSide value="1"/>
+					<properties>
+						<abackground value="Cr:122,207,245,255"/>
+						<aforeground value="Cr:0,0,0,255"/>
+						<azOrder value="-1"/>
+						<acreatorDiagramType value="ClassDiagram"/>
+						<aselectable value="true"/>
+						<arequestResetCaption value="false"/>
+						<arequestResetCaptionSize value="false"/>
+						<aconnectorStyle value="3"/>
+						<aconnectorLineJumps value="4"/>
+						<aconnectorLabelOrientation value="4"/>
+						<afromShapeXDiff value="0"/>
+						<afromShapeYDiff value="0"/>
+						<atoShapeXDiff value="0"/>
+						<atoShapeYDiff value="0"/>
+						<afromConnectType value="0"/>
+						<atoConnectType value="0"/>
+						<auseFromShapeCenter value="true"/>
+						<auseToShapeCenter value="true"/>
+						<afromPinType value="1"/>
+						<atoPinType value="1"/>
+						<arequestRebuild value="false"/>
+						<ashowConnectorName value="2"/>
+						<apaintThroughLabel value="2"/>
+						<ahasRoleAShape value="false"/>
+						<ahasRoleBShape value="false"/>
+						<ashowMultiplicityConstraints value="false"/>
+						<ahasMultiplicityAShape value="false"/>
+						<ahasMultiplicityBShape value="false"/>
+						<a0SwDr value="false"/>
+						<ashowStereotypes value="true"/>
+						<ashowFromRoleName value="true"/>
+						<ashowToRoleName value="true"/>
+						<ashowFromMultiplicity value="true"/>
+						<ashowToMultiplicity value="true"/>
+						<ashowFromRoleVisibility value="true"/>
+						<ashowToRoleVisibility value="true"/>
+						<ashowAssociationEndPropertyStrings value="false"/>
+						<ahasAssociationEndPropertyStringsAShape value="false"/>
+						<ahasAssociationEndPropertyStringsBShape value="false"/>
+						<afromRoleInternalWidth value="-2147483648"/>
+						<afromRoleInternalHeight value="-2147483648"/>
+						<atoRoleInternalWidth value="-2147483648"/>
+						<atoRoleInternalHeight value="-2147483648"/>
+						<afromMultiplicityInternalWidth value="-2147483648"/>
+						<afromMultiplicityInternalHeight value="-2147483648"/>
+						<atoMultiplicityInternalWidth value="-2147483648"/>
+						<atoMultiplicityInternalHeight value="-2147483648"/>
+						<aassociationEndPropertyStringsAInternalWidth value="-2147483648"/>
+						<aassociationEndPropertyStringsAInternalHeight value="-2147483648"/>
+						<aassociationEndPropertyStringsBInternalWidth value="-2147483648"/>
+						<aassociationEndPropertyStringsBInternalHeight value="-2147483648"/>
+					</properties>
+				</xmi:Extension>
+				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
+				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
+			</uml:DiagramElement>
+			<uml:DiagramElement geometry="412,198,120,50" preferredShapeType="Class" subject="qmwxzuyCiu1SNwz5" xmi:id="qmwxzuyCiu1SNwz4">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<captionBounds value="0,0,120,14"/>
+					<captionInternalWidth value="-2147483648"/>
+					<captionInternalHeight value="-2147483648"/>
+					<captionVisible value="true"/>
+					<captionSide value="12"/>
+					<properties>
+						<abackground value="Cr:192,192,192,255"/>
+						<aforeground value="Cr:0,0,0,255"/>
+						<azOrder value="10"/>
+						<acreatorDiagramType value="ClassDiagram"/>
+						<aselectable value="true"/>
+						<arequestResetCaption value="false"/>
+						<arequestResetCaptionSize value="false"/>
+						<adisplayStereotypeIcon value="false"/>
+						<aoverrideAppearanceWithStereotypeIcon value="true"/>
+						<arequestSetSizeOption value="0"/>
+						<aparentConnectorHeaderLength value="40"/>
+						<aparentConnectorLineLength value="10"/>
+						<aconnectToPoint value="true"/>
+						<aparentConnectorDTheta value="0.0"/>
+						<aconnectionPointType value="2"/>
+						<amodelElementNameAlignment value="9"/>
+						<arequestDefaultSize value="false"/>
+						<arequestFitSize value="false"/>
+						<arequestFitSizeFromCenter value="false"/>
+						<adisplayAsRobustnessAnalysisIcon value="true"/>
+						<avisibilityStyle value="1"/>
+						<ashowAttributeType value="1"/>
+						<ashowOperationType value="1"/>
+						<amSwTpPts value="true"/>
+						<alshRfAts value="true"/>
+						<amShDrAt value="false"/>
+						<akShDrOp value="false"/>
+						<akSwCsMbSt value="true"/>
+						<ashowClassMemberConstraints value="true"/>
+						<alShCmMl value="false"/>
+						<ashowOperationParameterDirection value="false"/>
+						<ashowOperationRaisedExceptions value="false"/>
+						<ashowParameterNameInOperationSignature value="true"/>
+						<ashowOperationTemplateParameters value="false"/>
+						<ashowOperationProperties value="false"/>
+						<awpMbs value="false"/>
+						<aattributeSortType value="0"/>
+						<aoperationSortType value="0"/>
+						<ashowInitialAttributeValue value="true"/>
+						<ashowOperationSignature value="true"/>
+						<ainterfaceBall value="false"/>
+						<ashowEmptyCompartments value="0"/>
+						<ashowEllipsisForUnshownMembers value="0"/>
+						<ashowAttributesCodeDetails value="0"/>
+						<ashowOperationsCodeDetails value="0"/>
+						<ashowParametersCodeDetails value="0"/>
+						<ashowTypeOption value="0"/>
+						<ashowOwnerOption value="3"/>
+						<ashowAttributesType value="0"/>
+						<ashowOperationsParameters value="0"/>
+						<ashowOperationsReturnType value="0"/>
+					</properties>
+				</xmi:Extension>
+				<elementFill color1="Cr:192,192,192,255" color2="" style="1" transparency="0" type="1"/>
+				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
+				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
+			</uml:DiagramElement>
+			<uml:DiagramElement geometry="451,158;451,197;" preferredShapeType="AssociationClass" subject="1DMxzuyCiu1SNw0F" xmi:id="1DMxzuyCiu1SNw0G">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<captionBounds value="461,197,20,0"/>
+					<captionInternalWidth value="-2147483648"/>
+					<captionInternalHeight value="-2147483648"/>
+					<captionVisible value="true"/>
+					<captionSide value="1"/>
+					<properties>
+						<abackground value="Cr:122,207,245,255"/>
+						<aforeground value="Cr:0,0,0,255"/>
+						<azOrder value="-1"/>
+						<aselectable value="true"/>
+						<arequestResetCaption value="false"/>
+						<arequestResetCaptionSize value="false"/>
+						<aconnectorStyle value="3"/>
+						<aconnectorLineJumps value="4"/>
+						<aconnectorLabelOrientation value="4"/>
+						<afromShapeXDiff value="0"/>
+						<afromShapeYDiff value="0"/>
+						<atoShapeXDiff value="0"/>
+						<atoShapeYDiff value="0"/>
+						<afromConnectType value="0"/>
+						<atoConnectType value="0"/>
+						<auseFromShapeCenter value="true"/>
+						<auseToShapeCenter value="true"/>
+						<afromPinType value="1"/>
+						<atoPinType value="1"/>
+						<arequestRebuild value="false"/>
+						<ashowConnectorName value="2"/>
+						<apaintThroughLabel value="2"/>
+					</properties>
+				</xmi:Extension>
+				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
+				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
+			</uml:DiagramElement>
+			<uml:DiagramElement geometry="411,206;179,206;179,146;" preferredShapeType="Association" subject="iyCxzuyCiu1SNw0N" xmi:id="iyCxzuyCiu1SNw0S">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<captionBounds value="207,207,58,14"/>
+					<captionInternalWidth value="-2147483648"/>
+					<captionInternalHeight value="-2147483648"/>
+					<captionVisible value="true"/>
+					<captionSide value="1"/>
+					<properties>
+						<abackground value="Cr:122,207,245,255"/>
+						<aforeground value="Cr:0,0,0,255"/>
+						<azOrder value="-1"/>
+						<acreatorDiagramType value="ClassDiagram"/>
+						<aselectable value="true"/>
+						<arequestResetCaption value="false"/>
+						<arequestResetCaptionSize value="false"/>
+						<aconnectorStyle value="3"/>
+						<aconnectorLineJumps value="4"/>
+						<aconnectorLabelOrientation value="4"/>
+						<afromShapeXDiff value="0"/>
+						<afromShapeYDiff value="0"/>
+						<atoShapeXDiff value="0"/>
+						<atoShapeYDiff value="0"/>
+						<afromConnectType value="0"/>
+						<atoConnectType value="0"/>
+						<auseFromShapeCenter value="true"/>
+						<auseToShapeCenter value="true"/>
+						<afromPinType value="1"/>
+						<atoPinType value="1"/>
+						<arequestRebuild value="false"/>
+						<ashowConnectorName value="2"/>
+						<apaintThroughLabel value="2"/>
+						<ahasRoleAShape value="false"/>
+						<ahasRoleBShape value="false"/>
+						<ashowMultiplicityConstraints value="false"/>
+						<ahasMultiplicityAShape value="false"/>
+						<ahasMultiplicityBShape value="false"/>
+						<a0SwDr value="false"/>
+						<ashowStereotypes value="true"/>
+						<ashowFromRoleName value="true"/>
+						<ashowToRoleName value="true"/>
+						<ashowFromMultiplicity value="true"/>
+						<ashowToMultiplicity value="true"/>
+						<ashowFromRoleVisibility value="true"/>
+						<ashowToRoleVisibility value="true"/>
+						<ashowAssociationEndPropertyStrings value="false"/>
+						<ahasAssociationEndPropertyStringsAShape value="false"/>
+						<ahasAssociationEndPropertyStringsBShape value="false"/>
+						<afromRoleInternalWidth value="-2147483648"/>
+						<afromRoleInternalHeight value="-2147483648"/>
+						<atoRoleInternalWidth value="-2147483648"/>
+						<atoRoleInternalHeight value="-2147483648"/>
+						<afromMultiplicityInternalWidth value="-2147483648"/>
+						<afromMultiplicityInternalHeight value="-2147483648"/>
+						<atoMultiplicityInternalWidth value="-2147483648"/>
+						<atoMultiplicityInternalHeight value="-2147483648"/>
+						<aassociationEndPropertyStringsAInternalWidth value="-2147483648"/>
+						<aassociationEndPropertyStringsAInternalHeight value="-2147483648"/>
+						<aassociationEndPropertyStringsBInternalWidth value="-2147483648"/>
+						<aassociationEndPropertyStringsBInternalHeight value="-2147483648"/>
+					</properties>
+				</xmi:Extension>
+				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
+				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
+			</uml:DiagramElement>
+			<uml:DiagramElement geometry="552,198,120,50" preferredShapeType="Class" subject="C9LxzuyCiu1SNw0z" xmi:id="89LxzuyCiu1SNw0y">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<captionBounds value="0,0,120,14"/>
+					<captionInternalWidth value="-2147483648"/>
+					<captionInternalHeight value="-2147483648"/>
+					<captionVisible value="true"/>
+					<captionSide value="12"/>
+					<properties>
+						<abackground value="Cr:192,192,192,255"/>
+						<aforeground value="Cr:0,0,0,255"/>
 						<azOrder value="8"/>
 						<acreatorDiagramType value="ClassDiagram"/>
 						<aselectable value="true"/>
@@ -12520,471 +13455,42 @@
 				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
 				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
 			</uml:DiagramElement>
-			<uml:DiagramElement geometry="280,170;280,309;" preferredShapeType="AssociationClass" subject="N.hRzuyCiu1SNwzM" xmi:id="N.hRzuyCiu1SNwzN">
-				<xmi:Extension extender="Visual Paradigm for UML">
-					<captionBounds value="290,259,20,0"/>
-					<captionInternalWidth value="-2147483648"/>
-					<captionInternalHeight value="-2147483648"/>
-					<captionVisible value="true"/>
-					<captionSide value="1"/>
-					<properties>
-						<abackground value="Cr:122,207,245,255"/>
-						<aforeground value="Cr:0,0,0,255"/>
-						<azOrder value="-1"/>
-						<aselectable value="true"/>
-						<arequestResetCaption value="false"/>
-						<arequestResetCaptionSize value="false"/>
-						<aconnectorStyle value="3"/>
-						<aconnectorLineJumps value="4"/>
-						<aconnectorLabelOrientation value="4"/>
-						<afromShapeXDiff value="0"/>
-						<afromShapeYDiff value="0"/>
-						<atoShapeXDiff value="0"/>
-						<atoShapeYDiff value="0"/>
-						<afromConnectType value="0"/>
-						<atoConnectType value="0"/>
-						<auseFromShapeCenter value="true"/>
-						<auseToShapeCenter value="true"/>
-						<afromPinType value="1"/>
-						<atoPinType value="1"/>
-						<arequestRebuild value="false"/>
-						<ashowConnectorName value="2"/>
-						<apaintThroughLabel value="2"/>
-					</properties>
-				</xmi:Extension>
-				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
-				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
-			</uml:DiagramElement>
-			<uml:DiagramElement geometry="640,310,80,40" preferredShapeType="Class" subject="CIdRzuyCiu1SNwzZ" xmi:id="8IdRzuyCiu1SNwzY">
-				<xmi:Extension extender="Visual Paradigm for UML">
-					<captionBounds value="0,0,80,14"/>
-					<captionInternalWidth value="-2147483648"/>
-					<captionInternalHeight value="-2147483648"/>
-					<captionVisible value="true"/>
-					<captionSide value="12"/>
-					<properties>
-						<abackground value="Cr:122,207,245,255"/>
-						<aforeground value="Cr:0,0,0,255"/>
-						<azOrder value="6"/>
-						<acreatorDiagramType value="ClassDiagram"/>
-						<aselectable value="true"/>
-						<arequestResetCaption value="false"/>
-						<arequestResetCaptionSize value="false"/>
-						<adisplayStereotypeIcon value="false"/>
-						<aoverrideAppearanceWithStereotypeIcon value="true"/>
-						<arequestSetSizeOption value="0"/>
-						<aparentConnectorHeaderLength value="40"/>
-						<aparentConnectorLineLength value="10"/>
-						<aconnectToPoint value="true"/>
-						<aparentConnectorDTheta value="0.0"/>
-						<aconnectionPointType value="2"/>
-						<amodelElementNameAlignment value="9"/>
-						<arequestDefaultSize value="false"/>
-						<arequestFitSize value="false"/>
-						<arequestFitSizeFromCenter value="false"/>
-						<adisplayAsRobustnessAnalysisIcon value="true"/>
-						<avisibilityStyle value="1"/>
-						<ashowAttributeType value="1"/>
-						<ashowOperationType value="1"/>
-						<amSwTpPts value="true"/>
-						<alshRfAts value="true"/>
-						<amShDrAt value="false"/>
-						<akShDrOp value="false"/>
-						<akSwCsMbSt value="true"/>
-						<ashowClassMemberConstraints value="true"/>
-						<alShCmMl value="false"/>
-						<ashowOperationParameterDirection value="false"/>
-						<ashowOperationRaisedExceptions value="false"/>
-						<ashowParameterNameInOperationSignature value="true"/>
-						<ashowOperationTemplateParameters value="false"/>
-						<ashowOperationProperties value="false"/>
-						<awpMbs value="false"/>
-						<aattributeSortType value="0"/>
-						<aoperationSortType value="0"/>
-						<ashowInitialAttributeValue value="true"/>
-						<ashowOperationSignature value="true"/>
-						<ainterfaceBall value="false"/>
-						<ashowEmptyCompartments value="0"/>
-						<ashowEllipsisForUnshownMembers value="0"/>
-						<ashowAttributesCodeDetails value="0"/>
-						<ashowOperationsCodeDetails value="0"/>
-						<ashowParametersCodeDetails value="0"/>
-						<ashowTypeOption value="0"/>
-						<ashowOwnerOption value="3"/>
-						<ashowAttributesType value="0"/>
-						<ashowOperationsParameters value="0"/>
-						<ashowOperationsReturnType value="0"/>
-					</properties>
-				</xmi:Extension>
-				<elementFill color1="Cr:122,207,245,255" color2="" style="1" transparency="0" type="1"/>
-				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
-				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
-			</uml:DiagramElement>
-			<uml:DiagramElement geometry="680,190;680,309;" preferredShapeType="Generalization" subject="cELRzuyCiu1SNwzd" xmi:id="cELRzuyCiu1SNwze">
-				<xmi:Extension extender="Visual Paradigm for UML">
-					<captionBounds value="680,249,20,0"/>
-					<captionInternalWidth value="-2147483648"/>
-					<captionInternalHeight value="-2147483648"/>
-					<captionVisible value="true"/>
-					<captionSide value="1"/>
-					<properties>
-						<abackground value="Cr:255,255,255,255"/>
-						<aforeground value="Cr:0,0,0,255"/>
-						<azOrder value="-1"/>
-						<acreatorDiagramType value="ClassDiagram"/>
-						<aselectable value="true"/>
-						<arequestResetCaption value="false"/>
-						<arequestResetCaptionSize value="false"/>
-						<aconnectorStyle value="3"/>
-						<aconnectorLineJumps value="4"/>
-						<aconnectorLabelOrientation value="4"/>
-						<afromShapeXDiff value="0"/>
-						<afromShapeYDiff value="0"/>
-						<atoShapeXDiff value="0"/>
-						<atoShapeYDiff value="0"/>
-						<afromConnectType value="0"/>
-						<atoConnectType value="0"/>
-						<auseFromShapeCenter value="true"/>
-						<auseToShapeCenter value="true"/>
-						<afromPinType value="1"/>
-						<atoPinType value="1"/>
-						<arequestRebuild value="false"/>
-						<ashowConnectorName value="2"/>
-						<apaintThroughLabel value="2"/>
-					</properties>
-				</xmi:Extension>
-				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
-				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
-			</uml:DiagramElement>
-			<uml:DiagramElement geometry="330,330;639,330;" preferredShapeType="Association" subject="tG7RzuyCiu1SNwzq" xmi:id="9G7RzuyCiu1SNwzv">
-				<xmi:Extension extender="Visual Paradigm for UML">
-					<captionBounds value="460,333,44,14"/>
-					<captionInternalWidth value="-2147483648"/>
-					<captionInternalHeight value="-2147483648"/>
-					<captionVisible value="true"/>
-					<captionSide value="1"/>
-					<properties>
-						<abackground value="Cr:122,207,245,255"/>
-						<aforeground value="Cr:0,0,0,255"/>
-						<azOrder value="-1"/>
-						<acreatorDiagramType value="ClassDiagram"/>
-						<aselectable value="true"/>
-						<arequestResetCaption value="false"/>
-						<arequestResetCaptionSize value="false"/>
-						<aconnectorStyle value="3"/>
-						<aconnectorLineJumps value="4"/>
-						<aconnectorLabelOrientation value="4"/>
-						<afromShapeXDiff value="0"/>
-						<afromShapeYDiff value="0"/>
-						<atoShapeXDiff value="0"/>
-						<atoShapeYDiff value="0"/>
-						<afromConnectType value="0"/>
-						<atoConnectType value="0"/>
-						<auseFromShapeCenter value="true"/>
-						<auseToShapeCenter value="true"/>
-						<afromPinType value="1"/>
-						<atoPinType value="1"/>
-						<arequestRebuild value="false"/>
-						<ashowConnectorName value="2"/>
-						<apaintThroughLabel value="2"/>
-						<ahasRoleAShape value="false"/>
-						<ahasRoleBShape value="false"/>
-						<ashowMultiplicityConstraints value="false"/>
-						<ahasMultiplicityAShape value="false"/>
-						<ahasMultiplicityBShape value="false"/>
-						<a0SwDr value="false"/>
-						<ashowStereotypes value="true"/>
-						<ashowFromRoleName value="true"/>
-						<ashowToRoleName value="true"/>
-						<ashowFromMultiplicity value="true"/>
-						<ashowToMultiplicity value="true"/>
-						<ashowFromRoleVisibility value="true"/>
-						<ashowToRoleVisibility value="true"/>
-						<ashowAssociationEndPropertyStrings value="false"/>
-						<ahasAssociationEndPropertyStringsAShape value="false"/>
-						<ahasAssociationEndPropertyStringsBShape value="false"/>
-						<afromRoleInternalWidth value="-2147483648"/>
-						<afromRoleInternalHeight value="-2147483648"/>
-						<atoRoleInternalWidth value="-2147483648"/>
-						<atoRoleInternalHeight value="-2147483648"/>
-						<afromMultiplicityInternalWidth value="-2147483648"/>
-						<afromMultiplicityInternalHeight value="-2147483648"/>
-						<atoMultiplicityInternalWidth value="-2147483648"/>
-						<atoMultiplicityInternalHeight value="-2147483648"/>
-						<aassociationEndPropertyStringsAInternalWidth value="-2147483648"/>
-						<aassociationEndPropertyStringsAInternalHeight value="-2147483648"/>
-						<aassociationEndPropertyStringsBInternalWidth value="-2147483648"/>
-						<aassociationEndPropertyStringsBInternalHeight value="-2147483648"/>
-					</properties>
-				</xmi:Extension>
-				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
-				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
-			</uml:DiagramElement>
-			<uml:DiagramElement geometry="370,260,120,50" preferredShapeType="Class" subject="qmwxzuyCiu1SNwz5" xmi:id="qmwxzuyCiu1SNwz4">
-				<xmi:Extension extender="Visual Paradigm for UML">
-					<captionBounds value="0,0,120,14"/>
-					<captionInternalWidth value="-2147483648"/>
-					<captionInternalHeight value="-2147483648"/>
-					<captionVisible value="true"/>
-					<captionSide value="12"/>
-					<properties>
-						<abackground value="Cr:192,192,192,255"/>
-						<aforeground value="Cr:0,0,0,255"/>
-						<azOrder value="4"/>
-						<acreatorDiagramType value="ClassDiagram"/>
-						<aselectable value="true"/>
-						<arequestResetCaption value="false"/>
-						<arequestResetCaptionSize value="false"/>
-						<adisplayStereotypeIcon value="false"/>
-						<aoverrideAppearanceWithStereotypeIcon value="true"/>
-						<arequestSetSizeOption value="0"/>
-						<aparentConnectorHeaderLength value="40"/>
-						<aparentConnectorLineLength value="10"/>
-						<aconnectToPoint value="true"/>
-						<aparentConnectorDTheta value="0.0"/>
-						<aconnectionPointType value="2"/>
-						<amodelElementNameAlignment value="9"/>
-						<arequestDefaultSize value="false"/>
-						<arequestFitSize value="false"/>
-						<arequestFitSizeFromCenter value="false"/>
-						<adisplayAsRobustnessAnalysisIcon value="true"/>
-						<avisibilityStyle value="1"/>
-						<ashowAttributeType value="1"/>
-						<ashowOperationType value="1"/>
-						<amSwTpPts value="true"/>
-						<alshRfAts value="true"/>
-						<amShDrAt value="false"/>
-						<akShDrOp value="false"/>
-						<akSwCsMbSt value="true"/>
-						<ashowClassMemberConstraints value="true"/>
-						<alShCmMl value="false"/>
-						<ashowOperationParameterDirection value="false"/>
-						<ashowOperationRaisedExceptions value="false"/>
-						<ashowParameterNameInOperationSignature value="true"/>
-						<ashowOperationTemplateParameters value="false"/>
-						<ashowOperationProperties value="false"/>
-						<awpMbs value="false"/>
-						<aattributeSortType value="0"/>
-						<aoperationSortType value="0"/>
-						<ashowInitialAttributeValue value="true"/>
-						<ashowOperationSignature value="true"/>
-						<ainterfaceBall value="false"/>
-						<ashowEmptyCompartments value="0"/>
-						<ashowEllipsisForUnshownMembers value="0"/>
-						<ashowAttributesCodeDetails value="0"/>
-						<ashowOperationsCodeDetails value="0"/>
-						<ashowParametersCodeDetails value="0"/>
-						<ashowTypeOption value="0"/>
-						<ashowOwnerOption value="3"/>
-						<ashowAttributesType value="0"/>
-						<ashowOperationsParameters value="0"/>
-						<ashowOperationsReturnType value="0"/>
-					</properties>
-				</xmi:Extension>
-				<elementFill color1="Cr:192,192,192,255" color2="" style="1" transparency="0" type="1"/>
-				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
-				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
-			</uml:DiagramElement>
-			<uml:DiagramElement geometry="450,230;450,259;" preferredShapeType="AssociationClass" subject="1DMxzuyCiu1SNw0F" xmi:id="1DMxzuyCiu1SNw0G">
-				<xmi:Extension extender="Visual Paradigm for UML">
-					<captionBounds value="460,259,20,0"/>
-					<captionInternalWidth value="-2147483648"/>
-					<captionInternalHeight value="-2147483648"/>
-					<captionVisible value="true"/>
-					<captionSide value="1"/>
-					<properties>
-						<abackground value="Cr:122,207,245,255"/>
-						<aforeground value="Cr:0,0,0,255"/>
-						<azOrder value="-1"/>
-						<aselectable value="true"/>
-						<arequestResetCaption value="false"/>
-						<arequestResetCaptionSize value="false"/>
-						<aconnectorStyle value="3"/>
-						<aconnectorLineJumps value="4"/>
-						<aconnectorLabelOrientation value="4"/>
-						<afromShapeXDiff value="0"/>
-						<afromShapeYDiff value="0"/>
-						<atoShapeXDiff value="0"/>
-						<atoShapeYDiff value="0"/>
-						<afromConnectType value="0"/>
-						<atoConnectType value="0"/>
-						<auseFromShapeCenter value="true"/>
-						<auseToShapeCenter value="true"/>
-						<afromPinType value="1"/>
-						<atoPinType value="1"/>
-						<arequestRebuild value="false"/>
-						<ashowConnectorName value="2"/>
-						<apaintThroughLabel value="2"/>
-					</properties>
-				</xmi:Extension>
-				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
-				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
-			</uml:DiagramElement>
-			<uml:DiagramElement geometry="369,270;180,270;180,220;" preferredShapeType="Association" subject="iyCxzuyCiu1SNw0N" xmi:id="iyCxzuyCiu1SNw0S">
-				<xmi:Extension extender="Visual Paradigm for UML">
-					<captionBounds value="202,271,58,14"/>
-					<captionInternalWidth value="-2147483648"/>
-					<captionInternalHeight value="-2147483648"/>
-					<captionVisible value="true"/>
-					<captionSide value="1"/>
-					<properties>
-						<abackground value="Cr:122,207,245,255"/>
-						<aforeground value="Cr:0,0,0,255"/>
-						<azOrder value="-1"/>
-						<acreatorDiagramType value="ClassDiagram"/>
-						<aselectable value="true"/>
-						<arequestResetCaption value="false"/>
-						<arequestResetCaptionSize value="false"/>
-						<aconnectorStyle value="3"/>
-						<aconnectorLineJumps value="4"/>
-						<aconnectorLabelOrientation value="4"/>
-						<afromShapeXDiff value="0"/>
-						<afromShapeYDiff value="0"/>
-						<atoShapeXDiff value="0"/>
-						<atoShapeYDiff value="0"/>
-						<afromConnectType value="0"/>
-						<atoConnectType value="0"/>
-						<auseFromShapeCenter value="true"/>
-						<auseToShapeCenter value="true"/>
-						<afromPinType value="1"/>
-						<atoPinType value="1"/>
-						<arequestRebuild value="false"/>
-						<ashowConnectorName value="2"/>
-						<apaintThroughLabel value="2"/>
-						<ahasRoleAShape value="false"/>
-						<ahasRoleBShape value="false"/>
-						<ashowMultiplicityConstraints value="false"/>
-						<ahasMultiplicityAShape value="false"/>
-						<ahasMultiplicityBShape value="false"/>
-						<a0SwDr value="false"/>
-						<ashowStereotypes value="true"/>
-						<ashowFromRoleName value="true"/>
-						<ashowToRoleName value="true"/>
-						<ashowFromMultiplicity value="true"/>
-						<ashowToMultiplicity value="true"/>
-						<ashowFromRoleVisibility value="true"/>
-						<ashowToRoleVisibility value="true"/>
-						<ashowAssociationEndPropertyStrings value="false"/>
-						<ahasAssociationEndPropertyStringsAShape value="false"/>
-						<ahasAssociationEndPropertyStringsBShape value="false"/>
-						<afromRoleInternalWidth value="-2147483648"/>
-						<afromRoleInternalHeight value="-2147483648"/>
-						<atoRoleInternalWidth value="-2147483648"/>
-						<atoRoleInternalHeight value="-2147483648"/>
-						<afromMultiplicityInternalWidth value="-2147483648"/>
-						<afromMultiplicityInternalHeight value="-2147483648"/>
-						<atoMultiplicityInternalWidth value="-2147483648"/>
-						<atoMultiplicityInternalHeight value="-2147483648"/>
-						<aassociationEndPropertyStringsAInternalWidth value="-2147483648"/>
-						<aassociationEndPropertyStringsAInternalHeight value="-2147483648"/>
-						<aassociationEndPropertyStringsBInternalWidth value="-2147483648"/>
-						<aassociationEndPropertyStringsBInternalHeight value="-2147483648"/>
-					</properties>
-				</xmi:Extension>
-				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
-				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
-			</uml:DiagramElement>
-			<uml:DiagramElement geometry="510,260,120,50" preferredShapeType="Class" subject="C9LxzuyCiu1SNw0z" xmi:id="89LxzuyCiu1SNw0y">
-				<xmi:Extension extender="Visual Paradigm for UML">
-					<captionBounds value="0,0,120,14"/>
-					<captionInternalWidth value="-2147483648"/>
-					<captionInternalHeight value="-2147483648"/>
-					<captionVisible value="true"/>
-					<captionSide value="12"/>
-					<properties>
-						<abackground value="Cr:192,192,192,255"/>
-						<aforeground value="Cr:0,0,0,255"/>
-						<azOrder value="2"/>
-						<acreatorDiagramType value="ClassDiagram"/>
-						<aselectable value="true"/>
-						<arequestResetCaption value="false"/>
-						<arequestResetCaptionSize value="false"/>
-						<adisplayStereotypeIcon value="false"/>
-						<aoverrideAppearanceWithStereotypeIcon value="true"/>
-						<arequestSetSizeOption value="0"/>
-						<aparentConnectorHeaderLength value="40"/>
-						<aparentConnectorLineLength value="10"/>
-						<aconnectToPoint value="true"/>
-						<aparentConnectorDTheta value="0.0"/>
-						<aconnectionPointType value="2"/>
-						<amodelElementNameAlignment value="9"/>
-						<arequestDefaultSize value="false"/>
-						<arequestFitSize value="false"/>
-						<arequestFitSizeFromCenter value="false"/>
-						<adisplayAsRobustnessAnalysisIcon value="true"/>
-						<avisibilityStyle value="1"/>
-						<ashowAttributeType value="1"/>
-						<ashowOperationType value="1"/>
-						<amSwTpPts value="true"/>
-						<alshRfAts value="true"/>
-						<amShDrAt value="false"/>
-						<akShDrOp value="false"/>
-						<akSwCsMbSt value="true"/>
-						<ashowClassMemberConstraints value="true"/>
-						<alShCmMl value="false"/>
-						<ashowOperationParameterDirection value="false"/>
-						<ashowOperationRaisedExceptions value="false"/>
-						<ashowParameterNameInOperationSignature value="true"/>
-						<ashowOperationTemplateParameters value="false"/>
-						<ashowOperationProperties value="false"/>
-						<awpMbs value="false"/>
-						<aattributeSortType value="0"/>
-						<aoperationSortType value="0"/>
-						<ashowInitialAttributeValue value="true"/>
-						<ashowOperationSignature value="true"/>
-						<ainterfaceBall value="false"/>
-						<ashowEmptyCompartments value="0"/>
-						<ashowEllipsisForUnshownMembers value="0"/>
-						<ashowAttributesCodeDetails value="0"/>
-						<ashowOperationsCodeDetails value="0"/>
-						<ashowParametersCodeDetails value="0"/>
-						<ashowTypeOption value="0"/>
-						<ashowOwnerOption value="3"/>
-						<ashowAttributesType value="0"/>
-						<ashowOperationsParameters value="0"/>
-						<ashowOperationsReturnType value="0"/>
-					</properties>
-				</xmi:Extension>
-				<elementFill color1="Cr:192,192,192,255" color2="" style="1" transparency="0" type="1"/>
-				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
-				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
-			</uml:DiagramElement>
-			<uml:DiagramElement geometry="560,160;560,259;" preferredShapeType="AssociationClass" subject="FMPxzuyCiu1SNw08" xmi:id="FMPxzuyCiu1SNw09">
-				<xmi:Extension extender="Visual Paradigm for UML">
-					<captionBounds value="570,229,20,0"/>
-					<captionInternalWidth value="-2147483648"/>
-					<captionInternalHeight value="-2147483648"/>
-					<captionVisible value="true"/>
-					<captionSide value="1"/>
-					<properties>
-						<abackground value="Cr:122,207,245,255"/>
-						<aforeground value="Cr:0,0,0,255"/>
-						<azOrder value="-1"/>
-						<aselectable value="true"/>
-						<arequestResetCaption value="false"/>
-						<arequestResetCaptionSize value="false"/>
-						<aconnectorStyle value="3"/>
-						<aconnectorLineJumps value="4"/>
-						<aconnectorLabelOrientation value="4"/>
-						<afromShapeXDiff value="0"/>
-						<afromShapeYDiff value="0"/>
-						<atoShapeXDiff value="0"/>
-						<atoShapeYDiff value="0"/>
-						<afromConnectType value="0"/>
-						<atoConnectType value="0"/>
-						<auseFromShapeCenter value="true"/>
-						<auseToShapeCenter value="true"/>
-						<afromPinType value="1"/>
-						<atoPinType value="1"/>
-						<arequestRebuild value="false"/>
-						<ashowConnectorName value="2"/>
-						<apaintThroughLabel value="2"/>
-					</properties>
-				</xmi:Extension>
-				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
-				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
-			</uml:DiagramElement>
-			<uml:DiagramElement geometry="92,96,676,164" preferredShapeType="SECurveShape" subject="XHTOHuyCiu1SNxIe" xmi:id="XHTOHuyCiu1SNxId">
+			<uml:DiagramElement geometry="593,88;593,197;" preferredShapeType="AssociationClass" subject="FMPxzuyCiu1SNw08" xmi:id="FMPxzuyCiu1SNw09">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<captionBounds value="603,162,20,0"/>
+					<captionInternalWidth value="-2147483648"/>
+					<captionInternalHeight value="-2147483648"/>
+					<captionVisible value="true"/>
+					<captionSide value="1"/>
+					<properties>
+						<abackground value="Cr:122,207,245,255"/>
+						<aforeground value="Cr:0,0,0,255"/>
+						<azOrder value="-1"/>
+						<aselectable value="true"/>
+						<arequestResetCaption value="false"/>
+						<arequestResetCaptionSize value="false"/>
+						<aconnectorStyle value="3"/>
+						<aconnectorLineJumps value="4"/>
+						<aconnectorLabelOrientation value="4"/>
+						<afromShapeXDiff value="0"/>
+						<afromShapeYDiff value="0"/>
+						<atoShapeXDiff value="0"/>
+						<atoShapeYDiff value="0"/>
+						<afromConnectType value="0"/>
+						<atoConnectType value="0"/>
+						<auseFromShapeCenter value="true"/>
+						<auseToShapeCenter value="true"/>
+						<afromPinType value="1"/>
+						<atoPinType value="1"/>
+						<arequestRebuild value="false"/>
+						<ashowConnectorName value="2"/>
+						<apaintThroughLabel value="2"/>
+					</properties>
+				</xmi:Extension>
+				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
+				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
+			</uml:DiagramElement>
+			<uml:DiagramElement geometry="92,24,676,164" preferredShapeType="SECurveShape" subject="XHTOHuyCiu1SNxIe" xmi:id="XHTOHuyCiu1SNxId">
 				<xmi:Extension extender="Visual Paradigm for UML">
 					<captionBounds value="0,0,40,40"/>
 					<captionInternalWidth value="-2147483648"/>
@@ -12994,7 +13500,7 @@
 					<properties>
 						<abackground value="Cr:255,255,192,127"/>
 						<aforeground value="Cr:192,192,192,255"/>
-						<azOrder value="16"/>
+						<azOrder value="22"/>
 						<aselectable value="true"/>
 						<arequestResetCaption value="false"/>
 						<arequestResetCaptionSize value="false"/>
@@ -13065,7 +13571,7 @@
 				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
 				<elementLine color="Cr:192,192,192,255" style="1" transparency="0" weight="1.0"/>
 			</uml:DiagramElement>
-			<uml:DiagramElement geometry="7,304,141,65" preferredShapeType="NOTE" subject="afB2HuyCiu1SNxHe" xmi:id="S5YuHuyCiu1SNxI3">
+			<uml:DiagramElement geometry="7,212,141,65" preferredShapeType="NOTE" subject="afB2HuyCiu1SNxHe" xmi:id="S5YuHuyCiu1SNxI3">
 				<xmi:Extension extender="Visual Paradigm for UML">
 					<captionBounds value="0,0,141,0"/>
 					<captionInternalWidth value="-2147483648"/>
@@ -13075,7 +13581,7 @@
 					<properties>
 						<abackground value="Cr:255,255,192,127"/>
 						<aforeground value="Cr:0,0,0,255"/>
-						<azOrder value="0"/>
+						<azOrder value="6"/>
 						<aselectable value="true"/>
 						<arequestResetCaption value="false"/>
 						<arequestResetCaptionSize value="false"/>
@@ -13098,15 +13604,318 @@
 				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
 				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
 			</uml:DiagramElement>
-			<uml:DiagramElement geometry="114,303;114,260;" preferredShapeType="Anchor" subject="lK0uHuyCiu1SNxI7" xmi:id="lK0uHuyCiu1SNxI8">
-				<xmi:Extension extender="Visual Paradigm for UML">
-					<captionBounds value="114,282,20,0"/>
-					<captionInternalWidth value="-2147483648"/>
-					<captionInternalHeight value="-2147483648"/>
-					<captionVisible value="true"/>
-					<captionSide value="1"/>
-					<properties>
-						<abackground value="Cr:122,207,245,255"/>
+			<uml:DiagramElement geometry="114,211;114,188;" preferredShapeType="Anchor" subject="lK0uHuyCiu1SNxI7" xmi:id="lK0uHuyCiu1SNxI8">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<captionBounds value="114,200,20,0"/>
+					<captionInternalWidth value="-2147483648"/>
+					<captionInternalHeight value="-2147483648"/>
+					<captionVisible value="true"/>
+					<captionSide value="1"/>
+					<properties>
+						<abackground value="Cr:122,207,245,255"/>
+						<aforeground value="Cr:0,0,0,255"/>
+						<azOrder value="-1"/>
+						<acreatorDiagramType value="ClassDiagram"/>
+						<aselectable value="true"/>
+						<arequestResetCaption value="false"/>
+						<arequestResetCaptionSize value="false"/>
+						<aconnectorStyle value="3"/>
+						<aconnectorLineJumps value="4"/>
+						<aconnectorLabelOrientation value="4"/>
+						<afromShapeXDiff value="0"/>
+						<afromShapeYDiff value="0"/>
+						<atoShapeXDiff value="0"/>
+						<atoShapeYDiff value="0"/>
+						<afromConnectType value="0"/>
+						<atoConnectType value="0"/>
+						<auseFromShapeCenter value="true"/>
+						<auseToShapeCenter value="true"/>
+						<afromPinType value="1"/>
+						<atoPinType value="1"/>
+						<arequestRebuild value="false"/>
+						<ashowConnectorName value="2"/>
+						<apaintThroughLabel value="2"/>
+					</properties>
+				</xmi:Extension>
+				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
+				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
+			</uml:DiagramElement>
+			<uml:DiagramElement geometry="267,363,105,40" preferredShapeType="Class" subject="4V6W3uyCiu1SNxTH" xmi:id="Fl6W3uyCiu1SNxTG">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<captionBounds value="0,0,105,28"/>
+					<captionInternalWidth value="-2147483648"/>
+					<captionInternalHeight value="-2147483648"/>
+					<captionVisible value="true"/>
+					<captionSide value="12"/>
+					<properties>
+						<abackground value="Cr:179,214,249,255"/>
+						<aforeground value="Cr:0,0,0,255"/>
+						<azOrder value="4"/>
+						<acreatorDiagramType value="ClassDiagram"/>
+						<aselectable value="true"/>
+						<arequestResetCaption value="false"/>
+						<arequestResetCaptionSize value="false"/>
+						<adisplayStereotypeIcon value="false"/>
+						<aoverrideAppearanceWithStereotypeIcon value="true"/>
+						<arequestSetSizeOption value="0"/>
+						<aparentConnectorHeaderLength value="40"/>
+						<aparentConnectorLineLength value="10"/>
+						<aconnectToPoint value="true"/>
+						<aparentConnectorDTheta value="0.0"/>
+						<aconnectionPointType value="2"/>
+						<amodelElementNameAlignment value="9"/>
+						<arequestDefaultSize value="false"/>
+						<arequestFitSize value="false"/>
+						<arequestFitSizeFromCenter value="false"/>
+						<adisplayAsRobustnessAnalysisIcon value="true"/>
+						<avisibilityStyle value="1"/>
+						<ashowAttributeType value="1"/>
+						<ashowOperationType value="1"/>
+						<amSwTpPts value="true"/>
+						<alshRfAts value="true"/>
+						<amShDrAt value="false"/>
+						<akShDrOp value="false"/>
+						<akSwCsMbSt value="true"/>
+						<ashowClassMemberConstraints value="true"/>
+						<alShCmMl value="false"/>
+						<ashowOperationParameterDirection value="false"/>
+						<ashowOperationRaisedExceptions value="false"/>
+						<ashowParameterNameInOperationSignature value="true"/>
+						<ashowOperationTemplateParameters value="false"/>
+						<ashowOperationProperties value="false"/>
+						<awpMbs value="false"/>
+						<aattributeSortType value="0"/>
+						<aoperationSortType value="0"/>
+						<ashowInitialAttributeValue value="true"/>
+						<ashowOperationSignature value="true"/>
+						<ainterfaceBall value="false"/>
+						<ashowEmptyCompartments value="0"/>
+						<ashowEllipsisForUnshownMembers value="0"/>
+						<ashowAttributesCodeDetails value="0"/>
+						<ashowOperationsCodeDetails value="0"/>
+						<ashowParametersCodeDetails value="0"/>
+						<ashowTypeOption value="0"/>
+						<ashowOwnerOption value="3"/>
+						<ashowAttributesType value="0"/>
+						<ashowOperationsParameters value="0"/>
+						<ashowOperationsReturnType value="0"/>
+					</properties>
+				</xmi:Extension>
+				<elementFill color1="Cr:179,214,249,255" color2="" style="1" transparency="0" type="1"/>
+				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
+				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
+			</uml:DiagramElement>
+			<uml:DiagramElement geometry="395,364,105,40" preferredShapeType="Class" subject="RB2W3uyCiu1SNxTP" xmi:id="hB2W3uyCiu1SNxTO">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<captionBounds value="0,0,105,28"/>
+					<captionInternalWidth value="-2147483648"/>
+					<captionInternalHeight value="-2147483648"/>
+					<captionVisible value="true"/>
+					<captionSide value="12"/>
+					<properties>
+						<abackground value="Cr:179,214,249,255"/>
+						<aforeground value="Cr:0,0,0,255"/>
+						<azOrder value="2"/>
+						<acreatorDiagramType value="ClassDiagram"/>
+						<aselectable value="true"/>
+						<arequestResetCaption value="false"/>
+						<arequestResetCaptionSize value="false"/>
+						<adisplayStereotypeIcon value="false"/>
+						<aoverrideAppearanceWithStereotypeIcon value="true"/>
+						<arequestSetSizeOption value="0"/>
+						<aparentConnectorHeaderLength value="40"/>
+						<aparentConnectorLineLength value="10"/>
+						<aconnectToPoint value="true"/>
+						<aparentConnectorDTheta value="0.0"/>
+						<aconnectionPointType value="2"/>
+						<amodelElementNameAlignment value="9"/>
+						<arequestDefaultSize value="false"/>
+						<arequestFitSize value="false"/>
+						<arequestFitSizeFromCenter value="false"/>
+						<adisplayAsRobustnessAnalysisIcon value="true"/>
+						<avisibilityStyle value="1"/>
+						<ashowAttributeType value="1"/>
+						<ashowOperationType value="1"/>
+						<amSwTpPts value="true"/>
+						<alshRfAts value="true"/>
+						<amShDrAt value="false"/>
+						<akShDrOp value="false"/>
+						<akSwCsMbSt value="true"/>
+						<ashowClassMemberConstraints value="true"/>
+						<alShCmMl value="false"/>
+						<ashowOperationParameterDirection value="false"/>
+						<ashowOperationRaisedExceptions value="false"/>
+						<ashowParameterNameInOperationSignature value="true"/>
+						<ashowOperationTemplateParameters value="false"/>
+						<ashowOperationProperties value="false"/>
+						<awpMbs value="false"/>
+						<aattributeSortType value="0"/>
+						<aoperationSortType value="0"/>
+						<ashowInitialAttributeValue value="true"/>
+						<ashowOperationSignature value="true"/>
+						<ainterfaceBall value="false"/>
+						<ashowEmptyCompartments value="0"/>
+						<ashowEllipsisForUnshownMembers value="0"/>
+						<ashowAttributesCodeDetails value="0"/>
+						<ashowOperationsCodeDetails value="0"/>
+						<ashowParametersCodeDetails value="0"/>
+						<ashowTypeOption value="0"/>
+						<ashowOwnerOption value="3"/>
+						<ashowAttributesType value="0"/>
+						<ashowOperationsParameters value="0"/>
+						<ashowOperationsReturnType value="0"/>
+					</properties>
+				</xmi:Extension>
+				<elementFill color1="Cr:179,214,249,255" color2="" style="1" transparency="0" type="1"/>
+				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
+				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
+			</uml:DiagramElement>
+			<uml:DiagramElement geometry="149,363,105,40" preferredShapeType="Class" subject="zuuW3uyCiu1SNxTU" xmi:id="zuuW3uyCiu1SNxTT">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<captionBounds value="0,0,105,28"/>
+					<captionInternalWidth value="-2147483648"/>
+					<captionInternalHeight value="-2147483648"/>
+					<captionVisible value="true"/>
+					<captionSide value="12"/>
+					<properties>
+						<abackground value="Cr:179,214,249,255"/>
+						<aforeground value="Cr:0,0,0,255"/>
+						<azOrder value="0"/>
+						<acreatorDiagramType value="ClassDiagram"/>
+						<aselectable value="true"/>
+						<arequestResetCaption value="false"/>
+						<arequestResetCaptionSize value="false"/>
+						<adisplayStereotypeIcon value="false"/>
+						<aoverrideAppearanceWithStereotypeIcon value="true"/>
+						<arequestSetSizeOption value="0"/>
+						<aparentConnectorHeaderLength value="40"/>
+						<aparentConnectorLineLength value="10"/>
+						<aconnectToPoint value="true"/>
+						<aparentConnectorDTheta value="0.0"/>
+						<aconnectionPointType value="2"/>
+						<amodelElementNameAlignment value="9"/>
+						<arequestDefaultSize value="false"/>
+						<arequestFitSize value="false"/>
+						<arequestFitSizeFromCenter value="false"/>
+						<adisplayAsRobustnessAnalysisIcon value="true"/>
+						<avisibilityStyle value="1"/>
+						<ashowAttributeType value="1"/>
+						<ashowOperationType value="1"/>
+						<amSwTpPts value="true"/>
+						<alshRfAts value="true"/>
+						<amShDrAt value="false"/>
+						<akShDrOp value="false"/>
+						<akSwCsMbSt value="true"/>
+						<ashowClassMemberConstraints value="true"/>
+						<alShCmMl value="false"/>
+						<ashowOperationParameterDirection value="false"/>
+						<ashowOperationRaisedExceptions value="false"/>
+						<ashowParameterNameInOperationSignature value="true"/>
+						<ashowOperationTemplateParameters value="false"/>
+						<ashowOperationProperties value="false"/>
+						<awpMbs value="false"/>
+						<aattributeSortType value="0"/>
+						<aoperationSortType value="0"/>
+						<ashowInitialAttributeValue value="true"/>
+						<ashowOperationSignature value="true"/>
+						<ainterfaceBall value="false"/>
+						<ashowEmptyCompartments value="0"/>
+						<ashowEllipsisForUnshownMembers value="0"/>
+						<ashowAttributesCodeDetails value="0"/>
+						<ashowOperationsCodeDetails value="0"/>
+						<ashowParametersCodeDetails value="0"/>
+						<ashowTypeOption value="0"/>
+						<ashowOwnerOption value="3"/>
+						<ashowAttributesType value="0"/>
+						<ashowOperationsParameters value="0"/>
+						<ashowOperationsReturnType value="0"/>
+					</properties>
+				</xmi:Extension>
+				<elementFill color1="Cr:179,214,249,255" color2="" style="1" transparency="0" type="1"/>
+				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
+				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
+			</uml:DiagramElement>
+			<uml:DiagramElement geometry="407,118;407,363;" preferredShapeType="Generalization" subject="BHNW3uyCiu1SNxT2" xmi:id="BHNW3uyCiu1SNxT3">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<captionBounds value="407,240,20,0"/>
+					<captionInternalWidth value="-2147483648"/>
+					<captionInternalHeight value="-2147483648"/>
+					<captionVisible value="true"/>
+					<captionSide value="1"/>
+					<properties>
+						<abackground value="Cr:255,255,255,255"/>
+						<aforeground value="Cr:0,0,0,255"/>
+						<azOrder value="-1"/>
+						<acreatorDiagramType value="ClassDiagram"/>
+						<aselectable value="true"/>
+						<arequestResetCaption value="false"/>
+						<arequestResetCaptionSize value="false"/>
+						<aconnectorStyle value="3"/>
+						<aconnectorLineJumps value="4"/>
+						<aconnectorLabelOrientation value="4"/>
+						<afromShapeXDiff value="0"/>
+						<afromShapeYDiff value="0"/>
+						<atoShapeXDiff value="0"/>
+						<atoShapeYDiff value="0"/>
+						<afromConnectType value="0"/>
+						<atoConnectType value="0"/>
+						<auseFromShapeCenter value="true"/>
+						<auseToShapeCenter value="true"/>
+						<afromPinType value="1"/>
+						<atoPinType value="1"/>
+						<arequestRebuild value="false"/>
+						<ashowConnectorName value="2"/>
+						<apaintThroughLabel value="2"/>
+					</properties>
+				</xmi:Extension>
+				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
+				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
+			</uml:DiagramElement>
+			<uml:DiagramElement geometry="382,118;382,125;371,363;" preferredShapeType="Generalization" subject="tJTW3uyCiu1SNxT." xmi:id="tJTW3uyCiu1SNxT_">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<captionBounds value="376,239,20,0"/>
+					<captionInternalWidth value="-2147483648"/>
+					<captionInternalHeight value="-2147483648"/>
+					<captionVisible value="true"/>
+					<captionSide value="1"/>
+					<properties>
+						<abackground value="Cr:255,255,255,255"/>
+						<aforeground value="Cr:0,0,0,255"/>
+						<azOrder value="-1"/>
+						<acreatorDiagramType value="ClassDiagram"/>
+						<aselectable value="true"/>
+						<arequestResetCaption value="false"/>
+						<arequestResetCaptionSize value="false"/>
+						<aconnectorStyle value="3"/>
+						<aconnectorLineJumps value="4"/>
+						<aconnectorLabelOrientation value="4"/>
+						<afromShapeXDiff value="0"/>
+						<afromShapeYDiff value="0"/>
+						<atoShapeXDiff value="0"/>
+						<atoShapeYDiff value="0"/>
+						<afromConnectType value="0"/>
+						<atoConnectType value="0"/>
+						<auseFromShapeCenter value="true"/>
+						<auseToShapeCenter value="true"/>
+						<afromPinType value="1"/>
+						<atoPinType value="1"/>
+						<arequestRebuild value="false"/>
+						<ashowConnectorName value="2"/>
+						<apaintThroughLabel value="2"/>
+					</properties>
+				</xmi:Extension>
+				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
+				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
+			</uml:DiagramElement>
+			<uml:DiagramElement geometry="371,118;296,328;254,363;" preferredShapeType="Generalization" subject="oCw23uyCiu1SNxUT" xmi:id="oCw23uyCiu1SNxUU">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<captionBounds value="323,252,20,0"/>
+					<captionInternalWidth value="-2147483648"/>
+					<captionInternalHeight value="-2147483648"/>
+					<captionVisible value="true"/>
+					<captionSide value="1"/>
+					<properties>
+						<abackground value="Cr:255,255,255,255"/>
 						<aforeground value="Cr:0,0,0,255"/>
 						<azOrder value="-1"/>
 						<acreatorDiagramType value="ClassDiagram"/>
@@ -13141,7 +13950,7 @@
 			<properties>
 				<apmAuthor value="lavm"/>
 				<apmCreateDateTime value="1337673922228"/>
-				<apmLastModified value="1337689857249"/>
+				<apmLastModified value="1337806320596"/>
 				<ashowPackageNameStyle value="0"/>
 				<ashowConnectorName value="0"/>
 				<apaintConnectorThroughLabel value="0"/>
@@ -13394,7 +14203,7 @@
 			<properties>
 				<apmAuthor value="lavm"/>
 				<apmCreateDateTime value="1337689857166"/>
-				<apmLastModified value="1337690584387"/>
+				<apmLastModified value="1337806342674"/>
 				<ashowPackageNameStyle value="0"/>
 				<ashowConnectorName value="0"/>
 				<apaintConnectorThroughLabel value="0"/>
@@ -13512,15 +14321,15 @@
 				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
 				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
 			</uml:DiagramElement>
-			<uml:DiagramElement geometry="140,110,80,40" preferredShapeType="Class" subject="XlvhLuyCiu1SNw38" xmi:id="XlvhLuyCiu1SNw37">
-				<xmi:Extension extender="Visual Paradigm for UML">
-					<captionBounds value="0,0,80,14"/>
+			<uml:DiagramElement geometry="138,110,105,40" preferredShapeType="Class" subject="XlvhLuyCiu1SNw38" xmi:id="XlvhLuyCiu1SNw37">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<captionBounds value="0,0,105,28"/>
 					<captionInternalWidth value="-2147483648"/>
 					<captionInternalHeight value="-2147483648"/>
 					<captionVisible value="true"/>
 					<captionSide value="12"/>
 					<properties>
-						<abackground value="Cr:122,207,245,255"/>
+						<abackground value="Cr:179,214,249,255"/>
 						<aforeground value="Cr:0,0,0,255"/>
 						<azOrder value="2"/>
 						<acreatorDiagramType value="ClassDiagram"/>
@@ -13573,13 +14382,13 @@
 						<ashowOperationsReturnType value="0"/>
 					</properties>
 				</xmi:Extension>
-				<elementFill color1="Cr:122,207,245,255" color2="" style="1" transparency="0" type="1"/>
-				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
-				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
-			</uml:DiagramElement>
-			<uml:DiagramElement geometry="419,120;220,120;" preferredShapeType="Generalization" subject="gt_hLuyCiu1SNw4A" xmi:id="gt_hLuyCiu1SNw4B">
-				<xmi:Extension extender="Visual Paradigm for UML">
-					<captionBounds value="310,130,20,0"/>
+				<elementFill color1="Cr:179,214,249,255" color2="" style="1" transparency="0" type="1"/>
+				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
+				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
+			</uml:DiagramElement>
+			<uml:DiagramElement geometry="419,120;243,120;" preferredShapeType="Generalization" subject="gt_hLuyCiu1SNw4A" xmi:id="gt_hLuyCiu1SNw4B">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<captionBounds value="321,130,20,0"/>
 					<captionInternalWidth value="-2147483648"/>
 					<captionInternalHeight value="-2147483648"/>
 					<captionVisible value="true"/>
@@ -13613,9 +14422,9 @@
 				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
 				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
 			</uml:DiagramElement>
-			<uml:DiagramElement geometry="419,140;220,140;" preferredShapeType="Association" subject="FwURLuyCiu1SNw4J" xmi:id="FwURLuyCiu1SNw4O">
-				<xmi:Extension extender="Visual Paradigm for UML">
-					<captionBounds value="260,142,109,14"/>
+			<uml:DiagramElement geometry="419,140;243,140;" preferredShapeType="Association" subject="FwURLuyCiu1SNw4J" xmi:id="FwURLuyCiu1SNw4O">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<captionBounds value="270,142,109,14"/>
 					<captionInternalWidth value="-2147483648"/>
 					<captionInternalHeight value="-2147483648"/>
 					<captionVisible value="true"/>
@@ -13912,7 +14721,7 @@
 			<properties>
 				<apmAuthor value="lavm"/>
 				<apmCreateDateTime value="1337690442410"/>
-				<apmLastModified value="1337724659136"/>
+				<apmLastModified value="1337876727401"/>
 				<ashowPackageNameStyle value="0"/>
 				<ashowConnectorName value="0"/>
 				<apaintConnectorThroughLabel value="0"/>
@@ -13940,7 +14749,7 @@
 				<ax value="0"/>
 				<ay value="0"/>
 				<awidth value="1235"/>
-				<aheight value="708"/>
+				<aheight value="450"/>
 				<aqualityScore value="-1"/>
 				<aparentModel value="NVoJLuyCiu1SNw6D"/>
 				<a_globalPaletteOption value="true"/>
@@ -13976,7 +14785,7 @@
 					<properties>
 						<abackground value="Cr:122,207,245,255"/>
 						<aforeground value="Cr:0,0,0,255"/>
-						<azOrder value="11"/>
+						<azOrder value="14"/>
 						<aselectable value="true"/>
 						<arequestResetCaption value="false"/>
 						<arequestResetCaptionSize value="false"/>
@@ -14030,17 +14839,17 @@
 				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
 				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
 			</uml:DiagramElement>
-			<uml:DiagramElement geometry="500,40,80,40" preferredShapeType="Class" subject="Jc2JLuyCiu1SNw6o" xmi:id="xc2JLuyCiu1SNw6n">
-				<xmi:Extension extender="Visual Paradigm for UML">
-					<captionBounds value="0,0,80,14"/>
+			<uml:DiagramElement geometry="500,40,110,40" preferredShapeType="Class" subject="Jc2JLuyCiu1SNw6o" xmi:id="xc2JLuyCiu1SNw6n">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<captionBounds value="0,0,110,28"/>
 					<captionInternalWidth value="-2147483648"/>
 					<captionInternalHeight value="-2147483648"/>
 					<captionVisible value="true"/>
 					<captionSide value="12"/>
 					<properties>
-						<abackground value="Cr:122,207,245,255"/>
-						<aforeground value="Cr:0,0,0,255"/>
-						<azOrder value="9"/>
+						<abackground value="Cr:179,214,249,255"/>
+						<aforeground value="Cr:0,0,0,255"/>
+						<azOrder value="12"/>
 						<acreatorDiagramType value="ClassDiagram"/>
 						<aselectable value="true"/>
 						<arequestResetCaption value="false"/>
@@ -14091,7 +14900,7 @@
 						<ashowOperationsReturnType value="0"/>
 					</properties>
 				</xmi:Extension>
-				<elementFill color1="Cr:122,207,245,255" color2="" style="1" transparency="0" type="1"/>
+				<elementFill color1="Cr:179,214,249,255" color2="" style="1" transparency="0" type="1"/>
 				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
 				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
 			</uml:DiagramElement>
@@ -14131,17 +14940,17 @@
 				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
 				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
 			</uml:DiagramElement>
-			<uml:DiagramElement geometry="700,40,80,40" preferredShapeType="Class" subject="L9xJLuyCiu1SNw61" xmi:id="L9xJLuyCiu1SNw60">
-				<xmi:Extension extender="Visual Paradigm for UML">
-					<captionBounds value="0,0,80,14"/>
+			<uml:DiagramElement geometry="700,40,110,40" preferredShapeType="Class" subject="L9xJLuyCiu1SNw61" xmi:id="L9xJLuyCiu1SNw60">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<captionBounds value="0,0,110,28"/>
 					<captionInternalWidth value="-2147483648"/>
 					<captionInternalHeight value="-2147483648"/>
 					<captionVisible value="true"/>
 					<captionSide value="12"/>
 					<properties>
-						<abackground value="Cr:122,207,245,255"/>
-						<aforeground value="Cr:0,0,0,255"/>
-						<azOrder value="7"/>
+						<abackground value="Cr:179,214,249,255"/>
+						<aforeground value="Cr:0,0,0,255"/>
+						<azOrder value="10"/>
 						<acreatorDiagramType value="ClassDiagram"/>
 						<aselectable value="true"/>
 						<arequestResetCaption value="false"/>
@@ -14192,11 +15001,11 @@
 						<ashowOperationsReturnType value="0"/>
 					</properties>
 				</xmi:Extension>
-				<elementFill color1="Cr:122,207,245,255" color2="" style="1" transparency="0" type="1"/>
-				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
-				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
-			</uml:DiagramElement>
-			<uml:DiagramElement geometry="580,60;699,60;" preferredShapeType="Generalization" subject="ouFJLuyCiu1SNw6_" xmi:id="ouFJLuyCiu1SNw7A">
+				<elementFill color1="Cr:179,214,249,255" color2="" style="1" transparency="0" type="1"/>
+				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
+				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
+			</uml:DiagramElement>
+			<uml:DiagramElement geometry="610,60;699,60;" preferredShapeType="Generalization" subject="ouFJLuyCiu1SNw6_" xmi:id="ouFJLuyCiu1SNw7A">
 				<xmi:Extension extender="Visual Paradigm for UML">
 					<captionBounds value="629,60,20,0"/>
 					<captionInternalWidth value="-2147483648"/>
@@ -14242,7 +15051,7 @@
 					<properties>
 						<abackground value="Cr:192,255,192,255"/>
 						<aforeground value="Cr:0,0,0,255"/>
-						<azOrder value="5"/>
+						<azOrder value="8"/>
 						<aselectable value="true"/>
 						<arequestResetCaption value="false"/>
 						<arequestResetCaptionSize value="false"/>
@@ -14306,7 +15115,7 @@
 					<properties>
 						<abackground value="Cr:122,207,245,255"/>
 						<aforeground value="Cr:0,0,0,255"/>
-						<azOrder value="3"/>
+						<azOrder value="6"/>
 						<acreatorDiagramType value="ClassDiagram"/>
 						<aselectable value="true"/>
 						<arequestResetCaption value="false"/>
@@ -14489,9 +15298,9 @@
 				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
 				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
 			</uml:DiagramElement>
-			<uml:DiagramElement geometry="740,80;740,160;830,160;830,60;780,60;" preferredShapeType="Association" subject="MMoybuyCiu1SNxF6" xmi:id="sMoybuyCiu1SNxF_">
-				<xmi:Extension extender="Visual Paradigm for UML">
-					<captionBounds value="760,170,146,14"/>
+			<uml:DiagramElement geometry="740,80;740,160;670,160;670,70;699,70;" preferredShapeType="Association" subject="MMoybuyCiu1SNxF6" xmi:id="sMoybuyCiu1SNxF_">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<captionBounds value="620,170,67,14"/>
 					<captionInternalWidth value="-2147483648"/>
 					<captionInternalHeight value="-2147483648"/>
 					<captionVisible value="true"/>
@@ -14553,9 +15362,465 @@
 				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
 				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
 			</uml:DiagramElement>
-			<uml:DiagramElement geometry="430,160,160,40" preferredShapeType="Class" subject="YmaybuyCiu1SNxGR" xmi:id="YmaybuyCiu1SNxGQ">
-				<xmi:Extension extender="Visual Paradigm for UML">
-					<captionBounds value="0,0,160,14"/>
+			<uml:DiagramElement geometry="470,160,80,50" preferredShapeType="Class" subject="YmaybuyCiu1SNxGR" xmi:id="YmaybuyCiu1SNxGQ">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<captionBounds value="0,0,80,14"/>
+					<captionInternalWidth value="-2147483648"/>
+					<captionInternalHeight value="-2147483648"/>
+					<captionVisible value="true"/>
+					<captionSide value="12"/>
+					<properties>
+						<abackground value="Cr:192,192,192,255"/>
+						<aforeground value="Cr:0,0,0,255"/>
+						<azOrder value="4"/>
+						<acreatorDiagramType value="ClassDiagram"/>
+						<aselectable value="true"/>
+						<arequestResetCaption value="false"/>
+						<arequestResetCaptionSize value="false"/>
+						<adisplayStereotypeIcon value="false"/>
+						<aoverrideAppearanceWithStereotypeIcon value="true"/>
+						<arequestSetSizeOption value="0"/>
+						<aparentConnectorHeaderLength value="40"/>
+						<aparentConnectorLineLength value="10"/>
+						<aconnectToPoint value="true"/>
+						<aparentConnectorDTheta value="0.0"/>
+						<aconnectionPointType value="2"/>
+						<amodelElementNameAlignment value="9"/>
+						<arequestDefaultSize value="false"/>
+						<arequestFitSize value="false"/>
+						<arequestFitSizeFromCenter value="false"/>
+						<adisplayAsRobustnessAnalysisIcon value="true"/>
+						<avisibilityStyle value="1"/>
+						<ashowAttributeType value="1"/>
+						<ashowOperationType value="1"/>
+						<amSwTpPts value="true"/>
+						<alshRfAts value="true"/>
+						<amShDrAt value="false"/>
+						<akShDrOp value="false"/>
+						<akSwCsMbSt value="true"/>
+						<ashowClassMemberConstraints value="true"/>
+						<alShCmMl value="false"/>
+						<ashowOperationParameterDirection value="false"/>
+						<ashowOperationRaisedExceptions value="false"/>
+						<ashowParameterNameInOperationSignature value="true"/>
+						<ashowOperationTemplateParameters value="false"/>
+						<ashowOperationProperties value="false"/>
+						<awpMbs value="false"/>
+						<aattributeSortType value="0"/>
+						<aoperationSortType value="0"/>
+						<ashowInitialAttributeValue value="true"/>
+						<ashowOperationSignature value="true"/>
+						<ainterfaceBall value="false"/>
+						<ashowEmptyCompartments value="0"/>
+						<ashowEllipsisForUnshownMembers value="0"/>
+						<ashowAttributesCodeDetails value="0"/>
+						<ashowOperationsCodeDetails value="0"/>
+						<ashowParametersCodeDetails value="0"/>
+						<ashowTypeOption value="0"/>
+						<ashowOwnerOption value="3"/>
+						<ashowAttributesType value="0"/>
+						<ashowOperationsParameters value="0"/>
+						<ashowOperationsReturnType value="0"/>
+					</properties>
+				</xmi:Extension>
+				<elementFill color1="Cr:192,192,192,255" color2="" style="1" transparency="0" type="1"/>
+				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
+				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
+			</uml:DiagramElement>
+			<uml:DiagramElement geometry="690,160;690,190;550,190;" preferredShapeType="AssociationClass" subject="fpOybuyCiu1SNxGW" xmi:id="fpOybuyCiu1SNxGX">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<captionBounds value="586,218,20,0"/>
+					<captionInternalWidth value="-2147483648"/>
+					<captionInternalHeight value="-2147483648"/>
+					<captionVisible value="true"/>
+					<captionSide value="1"/>
+					<properties>
+						<abackground value="Cr:122,207,245,255"/>
+						<aforeground value="Cr:0,0,0,255"/>
+						<azOrder value="-1"/>
+						<aselectable value="true"/>
+						<arequestResetCaption value="false"/>
+						<arequestResetCaptionSize value="false"/>
+						<aconnectorStyle value="3"/>
+						<aconnectorLineJumps value="4"/>
+						<aconnectorLabelOrientation value="4"/>
+						<afromShapeXDiff value="0"/>
+						<afromShapeYDiff value="0"/>
+						<atoShapeXDiff value="0"/>
+						<atoShapeYDiff value="0"/>
+						<afromConnectType value="0"/>
+						<atoConnectType value="0"/>
+						<auseFromShapeCenter value="true"/>
+						<auseToShapeCenter value="true"/>
+						<afromPinType value="1"/>
+						<atoPinType value="1"/>
+						<arequestRebuild value="false"/>
+						<ashowConnectorName value="2"/>
+						<apaintThroughLabel value="2"/>
+					</properties>
+				</xmi:Extension>
+				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
+				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
+			</uml:DiagramElement>
+			<uml:DiagramElement geometry="469,180;300,180;" preferredShapeType="Association" subject="QjBybuyCiu1SNxGg" xmi:id="QjBybuyCiu1SNxGl">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<captionBounds value="355,180,20,0"/>
+					<captionInternalWidth value="-2147483648"/>
+					<captionInternalHeight value="-2147483648"/>
+					<captionVisible value="true"/>
+					<captionSide value="1"/>
+					<properties>
+						<abackground value="Cr:122,207,245,255"/>
+						<aforeground value="Cr:0,0,0,255"/>
+						<azOrder value="-1"/>
+						<acreatorDiagramType value="ClassDiagram"/>
+						<aselectable value="true"/>
+						<arequestResetCaption value="false"/>
+						<arequestResetCaptionSize value="false"/>
+						<aconnectorStyle value="3"/>
+						<aconnectorLineJumps value="4"/>
+						<aconnectorLabelOrientation value="4"/>
+						<afromShapeXDiff value="0"/>
+						<afromShapeYDiff value="0"/>
+						<atoShapeXDiff value="0"/>
+						<atoShapeYDiff value="0"/>
+						<afromConnectType value="0"/>
+						<atoConnectType value="0"/>
+						<auseFromShapeCenter value="true"/>
+						<auseToShapeCenter value="true"/>
+						<afromPinType value="1"/>
+						<atoPinType value="1"/>
+						<arequestRebuild value="false"/>
+						<ashowConnectorName value="2"/>
+						<apaintThroughLabel value="2"/>
+						<ahasRoleAShape value="false"/>
+						<ahasRoleBShape value="false"/>
+						<ashowMultiplicityConstraints value="false"/>
+						<ahasMultiplicityAShape value="false"/>
+						<ahasMultiplicityBShape value="false"/>
+						<a0SwDr value="false"/>
+						<ashowStereotypes value="true"/>
+						<ashowFromRoleName value="true"/>
+						<ashowToRoleName value="true"/>
+						<ashowFromMultiplicity value="true"/>
+						<ashowToMultiplicity value="true"/>
+						<ashowFromRoleVisibility value="true"/>
+						<ashowToRoleVisibility value="true"/>
+						<ashowAssociationEndPropertyStrings value="false"/>
+						<ahasAssociationEndPropertyStringsAShape value="false"/>
+						<ahasAssociationEndPropertyStringsBShape value="false"/>
+						<afromRoleInternalWidth value="-2147483648"/>
+						<afromRoleInternalHeight value="-2147483648"/>
+						<atoRoleInternalWidth value="-2147483648"/>
+						<atoRoleInternalHeight value="-2147483648"/>
+						<afromMultiplicityInternalWidth value="-2147483648"/>
+						<afromMultiplicityInternalHeight value="-2147483648"/>
+						<atoMultiplicityInternalWidth value="-2147483648"/>
+						<atoMultiplicityInternalHeight value="-2147483648"/>
+						<aassociationEndPropertyStringsAInternalWidth value="-2147483648"/>
+						<aassociationEndPropertyStringsAInternalHeight value="-2147483648"/>
+						<aassociationEndPropertyStringsBInternalWidth value="-2147483648"/>
+						<aassociationEndPropertyStringsBInternalHeight value="-2147483648"/>
+					</properties>
+				</xmi:Extension>
+				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
+				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
+			</uml:DiagramElement>
+			<uml:DiagramElement geometry="770,80;770,160;830,160;830,60;810,60;" preferredShapeType="Association" subject="m4aBHuyCiu1SNxLY" xmi:id="m4aBHuyCiu1SNxLd">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<captionBounds value="810,170,63,14"/>
+					<captionInternalWidth value="-2147483648"/>
+					<captionInternalHeight value="-2147483648"/>
+					<captionVisible value="true"/>
+					<captionSide value="1"/>
+					<properties>
+						<abackground value="Cr:122,207,245,255"/>
+						<aforeground value="Cr:0,0,0,255"/>
+						<azOrder value="-1"/>
+						<acreatorDiagramType value="ClassDiagram"/>
+						<aselectable value="true"/>
+						<arequestResetCaption value="false"/>
+						<arequestResetCaptionSize value="false"/>
+						<aconnectorStyle value="3"/>
+						<aconnectorLineJumps value="4"/>
+						<aconnectorLabelOrientation value="4"/>
+						<afromShapeXDiff value="0"/>
+						<afromShapeYDiff value="0"/>
+						<atoShapeXDiff value="0"/>
+						<atoShapeYDiff value="0"/>
+						<afromConnectType value="0"/>
+						<atoConnectType value="0"/>
+						<auseFromShapeCenter value="true"/>
+						<auseToShapeCenter value="true"/>
+						<afromPinType value="1"/>
+						<atoPinType value="1"/>
+						<arequestRebuild value="false"/>
+						<ashowConnectorName value="2"/>
+						<apaintThroughLabel value="2"/>
+						<ahasRoleAShape value="false"/>
+						<ahasRoleBShape value="false"/>
+						<ashowMultiplicityConstraints value="false"/>
+						<ahasMultiplicityAShape value="false"/>
+						<ahasMultiplicityBShape value="false"/>
+						<a0SwDr value="false"/>
+						<ashowStereotypes value="true"/>
+						<ashowFromRoleName value="true"/>
+						<ashowToRoleName value="true"/>
+						<ashowFromMultiplicity value="true"/>
+						<ashowToMultiplicity value="true"/>
+						<ashowFromRoleVisibility value="true"/>
+						<ashowToRoleVisibility value="true"/>
+						<ashowAssociationEndPropertyStrings value="false"/>
+						<ahasAssociationEndPropertyStringsAShape value="false"/>
+						<ahasAssociationEndPropertyStringsBShape value="false"/>
+						<afromRoleInternalWidth value="-2147483648"/>
+						<afromRoleInternalHeight value="-2147483648"/>
+						<atoRoleInternalWidth value="-2147483648"/>
+						<atoRoleInternalHeight value="-2147483648"/>
+						<afromMultiplicityInternalWidth value="-2147483648"/>
+						<afromMultiplicityInternalHeight value="-2147483648"/>
+						<atoMultiplicityInternalWidth value="-2147483648"/>
+						<atoMultiplicityInternalHeight value="-2147483648"/>
+						<aassociationEndPropertyStringsAInternalWidth value="-2147483648"/>
+						<aassociationEndPropertyStringsAInternalHeight value="-2147483648"/>
+						<aassociationEndPropertyStringsBInternalWidth value="-2147483648"/>
+						<aassociationEndPropertyStringsBInternalHeight value="-2147483648"/>
+					</properties>
+				</xmi:Extension>
+				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
+				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
+			</uml:DiagramElement>
+			<uml:DiagramElement geometry="470,340,80,50" preferredShapeType="Class" subject="Oa6BHuyCiu1SNxLh" xmi:id="Oa6BHuyCiu1SNxLg">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<captionBounds value="0,0,80,14"/>
+					<captionInternalWidth value="-2147483648"/>
+					<captionInternalHeight value="-2147483648"/>
+					<captionVisible value="true"/>
+					<captionSide value="12"/>
+					<properties>
+						<abackground value="Cr:192,192,192,255"/>
+						<aforeground value="Cr:0,0,0,255"/>
+						<azOrder value="2"/>
+						<acreatorDiagramType value="ClassDiagram"/>
+						<aselectable value="true"/>
+						<arequestResetCaption value="false"/>
+						<arequestResetCaptionSize value="false"/>
+						<adisplayStereotypeIcon value="false"/>
+						<aoverrideAppearanceWithStereotypeIcon value="true"/>
+						<arequestSetSizeOption value="0"/>
+						<aparentConnectorHeaderLength value="40"/>
+						<aparentConnectorLineLength value="10"/>
+						<aconnectToPoint value="true"/>
+						<aparentConnectorDTheta value="0.0"/>
+						<aconnectionPointType value="2"/>
+						<amodelElementNameAlignment value="9"/>
+						<arequestDefaultSize value="false"/>
+						<arequestFitSize value="false"/>
+						<arequestFitSizeFromCenter value="false"/>
+						<adisplayAsRobustnessAnalysisIcon value="true"/>
+						<avisibilityStyle value="1"/>
+						<ashowAttributeType value="1"/>
+						<ashowOperationType value="1"/>
+						<amSwTpPts value="true"/>
+						<alshRfAts value="true"/>
+						<amShDrAt value="false"/>
+						<akShDrOp value="false"/>
+						<akSwCsMbSt value="true"/>
+						<ashowClassMemberConstraints value="true"/>
+						<alShCmMl value="false"/>
+						<ashowOperationParameterDirection value="false"/>
+						<ashowOperationRaisedExceptions value="false"/>
+						<ashowParameterNameInOperationSignature value="true"/>
+						<ashowOperationTemplateParameters value="false"/>
+						<ashowOperationProperties value="false"/>
+						<awpMbs value="false"/>
+						<aattributeSortType value="0"/>
+						<aoperationSortType value="0"/>
+						<ashowInitialAttributeValue value="true"/>
+						<ashowOperationSignature value="true"/>
+						<ainterfaceBall value="false"/>
+						<ashowEmptyCompartments value="0"/>
+						<ashowEllipsisForUnshownMembers value="0"/>
+						<ashowAttributesCodeDetails value="0"/>
+						<ashowOperationsCodeDetails value="0"/>
+						<ashowParametersCodeDetails value="0"/>
+						<ashowTypeOption value="0"/>
+						<ashowOwnerOption value="3"/>
+						<ashowAttributesType value="0"/>
+						<ashowOperationsParameters value="0"/>
+						<ashowOperationsReturnType value="0"/>
+					</properties>
+				</xmi:Extension>
+				<elementFill color1="Cr:192,192,192,255" color2="" style="1" transparency="0" type="1"/>
+				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
+				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
+			</uml:DiagramElement>
+			<uml:DiagramElement geometry="810,160;810,360;550,360;" preferredShapeType="AssociationClass" subject="Lu.BHuyCiu1SNxLr" xmi:id="ru.BHuyCiu1SNxLs">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<captionBounds value="809,381,20,0"/>
+					<captionInternalWidth value="-2147483648"/>
+					<captionInternalHeight value="-2147483648"/>
+					<captionVisible value="true"/>
+					<captionSide value="1"/>
+					<properties>
+						<abackground value="Cr:122,207,245,255"/>
+						<aforeground value="Cr:0,0,0,255"/>
+						<azOrder value="-1"/>
+						<aselectable value="true"/>
+						<arequestResetCaption value="false"/>
+						<arequestResetCaptionSize value="false"/>
+						<aconnectorStyle value="3"/>
+						<aconnectorLineJumps value="4"/>
+						<aconnectorLabelOrientation value="4"/>
+						<afromShapeXDiff value="0"/>
+						<afromShapeYDiff value="0"/>
+						<atoShapeXDiff value="0"/>
+						<atoShapeYDiff value="0"/>
+						<afromConnectType value="0"/>
+						<atoConnectType value="0"/>
+						<auseFromShapeCenter value="true"/>
+						<auseToShapeCenter value="true"/>
+						<afromPinType value="1"/>
+						<atoPinType value="1"/>
+						<arequestRebuild value="false"/>
+						<ashowConnectorName value="2"/>
+						<apaintThroughLabel value="2"/>
+					</properties>
+				</xmi:Extension>
+				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
+				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
+			</uml:DiagramElement>
+			<uml:DiagramElement geometry="469,360;140,360;140,80;" preferredShapeType="Association" subject="ghXBHuyCiu1SNxMM" xmi:id="IhXBHuyCiu1SNxMR">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<captionBounds value="134,359,20,0"/>
+					<captionInternalWidth value="-2147483648"/>
+					<captionInternalHeight value="-2147483648"/>
+					<captionVisible value="true"/>
+					<captionSide value="1"/>
+					<properties>
+						<abackground value="Cr:122,207,245,255"/>
+						<aforeground value="Cr:0,0,0,255"/>
+						<azOrder value="-1"/>
+						<acreatorDiagramType value="ClassDiagram"/>
+						<aselectable value="true"/>
+						<arequestResetCaption value="false"/>
+						<arequestResetCaptionSize value="false"/>
+						<aconnectorStyle value="3"/>
+						<aconnectorLineJumps value="4"/>
+						<aconnectorLabelOrientation value="4"/>
+						<afromShapeXDiff value="0"/>
+						<afromShapeYDiff value="0"/>
+						<atoShapeXDiff value="0"/>
+						<atoShapeYDiff value="0"/>
+						<afromConnectType value="0"/>
+						<atoConnectType value="0"/>
+						<auseFromShapeCenter value="true"/>
+						<auseToShapeCenter value="true"/>
+						<afromPinType value="1"/>
+						<atoPinType value="1"/>
+						<arequestRebuild value="false"/>
+						<ashowConnectorName value="2"/>
+						<apaintThroughLabel value="2"/>
+						<ahasRoleAShape value="false"/>
+						<ahasRoleBShape value="false"/>
+						<ashowMultiplicityConstraints value="false"/>
+						<ahasMultiplicityAShape value="false"/>
+						<ahasMultiplicityBShape value="false"/>
+						<a0SwDr value="false"/>
+						<ashowStereotypes value="true"/>
+						<ashowFromRoleName value="true"/>
+						<ashowToRoleName value="true"/>
+						<ashowFromMultiplicity value="true"/>
+						<ashowToMultiplicity value="true"/>
+						<ashowFromRoleVisibility value="true"/>
+						<ashowToRoleVisibility value="true"/>
+						<ashowAssociationEndPropertyStrings value="false"/>
+						<ahasAssociationEndPropertyStringsAShape value="false"/>
+						<ahasAssociationEndPropertyStringsBShape value="false"/>
+						<afromRoleInternalWidth value="-2147483648"/>
+						<afromRoleInternalHeight value="-2147483648"/>
+						<atoRoleInternalWidth value="-2147483648"/>
+						<atoRoleInternalHeight value="-2147483648"/>
+						<afromMultiplicityInternalWidth value="-2147483648"/>
+						<afromMultiplicityInternalHeight value="-2147483648"/>
+						<atoMultiplicityInternalWidth value="-2147483648"/>
+						<atoMultiplicityInternalHeight value="-2147483648"/>
+						<aassociationEndPropertyStringsAInternalWidth value="-2147483648"/>
+						<aassociationEndPropertyStringsAInternalHeight value="-2147483648"/>
+						<aassociationEndPropertyStringsBInternalWidth value="-2147483648"/>
+						<aassociationEndPropertyStringsBInternalHeight value="-2147483648"/>
+					</properties>
+				</xmi:Extension>
+				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
+				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
+			</uml:DiagramElement>
+			<uml:DiagramElement geometry="260,200;260,230;750,230;750,80;" preferredShapeType="Association" subject="SA4hHuyCiu1SNxMa" xmi:id="KA4hHuyCiu1SNxMf">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<captionBounds value="290,230,77,14"/>
+					<captionInternalWidth value="-2147483648"/>
+					<captionInternalHeight value="-2147483648"/>
+					<captionVisible value="true"/>
+					<captionSide value="1"/>
+					<properties>
+						<abackground value="Cr:122,207,245,255"/>
+						<aforeground value="Cr:0,0,0,255"/>
+						<azOrder value="-1"/>
+						<acreatorDiagramType value="ClassDiagram"/>
+						<aselectable value="true"/>
+						<arequestResetCaption value="false"/>
+						<arequestResetCaptionSize value="false"/>
+						<aconnectorStyle value="3"/>
+						<aconnectorLineJumps value="4"/>
+						<aconnectorLabelOrientation value="4"/>
+						<afromShapeXDiff value="0"/>
+						<afromShapeYDiff value="0"/>
+						<atoShapeXDiff value="0"/>
+						<atoShapeYDiff value="0"/>
+						<afromConnectType value="0"/>
+						<atoConnectType value="0"/>
+						<auseFromShapeCenter value="true"/>
+						<auseToShapeCenter value="true"/>
+						<afromPinType value="1"/>
+						<atoPinType value="1"/>
+						<arequestRebuild value="false"/>
+						<ashowConnectorName value="2"/>
+						<apaintThroughLabel value="2"/>
+						<ahasRoleAShape value="false"/>
+						<ahasRoleBShape value="false"/>
+						<ashowMultiplicityConstraints value="false"/>
+						<ahasMultiplicityAShape value="false"/>
+						<ahasMultiplicityBShape value="false"/>
+						<a0SwDr value="false"/>
+						<ashowStereotypes value="true"/>
+						<ashowFromRoleName value="true"/>
+						<ashowToRoleName value="true"/>
+						<ashowFromMultiplicity value="true"/>
+						<ashowToMultiplicity value="true"/>
+						<ashowFromRoleVisibility value="true"/>
+						<ashowToRoleVisibility value="true"/>
+						<ashowAssociationEndPropertyStrings value="false"/>
+						<ahasAssociationEndPropertyStringsAShape value="false"/>
+						<ahasAssociationEndPropertyStringsBShape value="false"/>
+						<afromRoleInternalWidth value="-2147483648"/>
+						<afromRoleInternalHeight value="-2147483648"/>
+						<atoRoleInternalWidth value="-2147483648"/>
+						<atoRoleInternalHeight value="-2147483648"/>
+						<afromMultiplicityInternalWidth value="-2147483648"/>
+						<afromMultiplicityInternalHeight value="-2147483648"/>
+						<atoMultiplicityInternalWidth value="-2147483648"/>
+						<atoMultiplicityInternalHeight value="-2147483648"/>
+						<aassociationEndPropertyStringsAInternalWidth value="-2147483648"/>
+						<aassociationEndPropertyStringsAInternalHeight value="-2147483648"/>
+						<aassociationEndPropertyStringsBInternalWidth value="-2147483648"/>
+						<aassociationEndPropertyStringsBInternalHeight value="-2147483648"/>
+					</properties>
+				</xmi:Extension>
+				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
+				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
+			</uml:DiagramElement>
+			<uml:DiagramElement geometry="470,260,80,50" preferredShapeType="Class" subject="ThihHuyCiu1SNxMu" xmi:id="ThihHuyCiu1SNxMt">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<captionBounds value="0,0,80,14"/>
 					<captionInternalWidth value="-2147483648"/>
 					<captionInternalHeight value="-2147483648"/>
 					<captionVisible value="true"/>
@@ -14618,100 +15883,36 @@
 				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
 				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
 			</uml:DiagramElement>
-			<uml:DiagramElement geometry="750,160;750,190;590,190;" preferredShapeType="AssociationClass" subject="fpOybuyCiu1SNxGW" xmi:id="fpOybuyCiu1SNxGX">
-				<xmi:Extension extender="Visual Paradigm for UML">
-					<captionBounds value="671,218,20,0"/>
-					<captionInternalWidth value="-2147483648"/>
-					<captionInternalHeight value="-2147483648"/>
-					<captionVisible value="true"/>
-					<captionSide value="1"/>
-					<properties>
-						<abackground value="Cr:122,207,245,255"/>
-						<aforeground value="Cr:0,0,0,255"/>
-						<azOrder value="-1"/>
-						<aselectable value="true"/>
-						<arequestResetCaption value="false"/>
-						<arequestResetCaptionSize value="false"/>
-						<aconnectorStyle value="3"/>
-						<aconnectorLineJumps value="4"/>
-						<aconnectorLabelOrientation value="4"/>
-						<afromShapeXDiff value="0"/>
-						<afromShapeYDiff value="0"/>
-						<atoShapeXDiff value="0"/>
-						<atoShapeYDiff value="0"/>
-						<afromConnectType value="0"/>
-						<atoConnectType value="0"/>
-						<auseFromShapeCenter value="true"/>
-						<auseToShapeCenter value="true"/>
-						<afromPinType value="1"/>
-						<atoPinType value="1"/>
-						<arequestRebuild value="false"/>
-						<ashowConnectorName value="2"/>
-						<apaintThroughLabel value="2"/>
-					</properties>
-				</xmi:Extension>
-				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
-				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
-			</uml:DiagramElement>
-			<uml:DiagramElement geometry="429,180;300,180;" preferredShapeType="Association" subject="QjBybuyCiu1SNxGg" xmi:id="QjBybuyCiu1SNxGl">
-				<xmi:Extension extender="Visual Paradigm for UML">
-					<captionBounds value="355,180,20,0"/>
-					<captionInternalWidth value="-2147483648"/>
-					<captionInternalHeight value="-2147483648"/>
-					<captionVisible value="true"/>
-					<captionSide value="1"/>
-					<properties>
-						<abackground value="Cr:122,207,245,255"/>
-						<aforeground value="Cr:0,0,0,255"/>
-						<azOrder value="-1"/>
-						<acreatorDiagramType value="ClassDiagram"/>
-						<aselectable value="true"/>
-						<arequestResetCaption value="false"/>
-						<arequestResetCaptionSize value="false"/>
-						<aconnectorStyle value="3"/>
-						<aconnectorLineJumps value="4"/>
-						<aconnectorLabelOrientation value="4"/>
-						<afromShapeXDiff value="0"/>
-						<afromShapeYDiff value="0"/>
-						<atoShapeXDiff value="0"/>
-						<atoShapeYDiff value="0"/>
-						<afromConnectType value="0"/>
-						<atoConnectType value="0"/>
-						<auseFromShapeCenter value="true"/>
-						<auseToShapeCenter value="true"/>
-						<afromPinType value="1"/>
-						<atoPinType value="1"/>
-						<arequestRebuild value="false"/>
-						<ashowConnectorName value="2"/>
-						<apaintThroughLabel value="2"/>
-						<ahasRoleAShape value="false"/>
-						<ahasRoleBShape value="false"/>
-						<ashowMultiplicityConstraints value="false"/>
-						<ahasMultiplicityAShape value="false"/>
-						<ahasMultiplicityBShape value="false"/>
-						<a0SwDr value="false"/>
-						<ashowStereotypes value="true"/>
-						<ashowFromRoleName value="true"/>
-						<ashowToRoleName value="true"/>
-						<ashowFromMultiplicity value="true"/>
-						<ashowToMultiplicity value="true"/>
-						<ashowFromRoleVisibility value="true"/>
-						<ashowToRoleVisibility value="true"/>
-						<ashowAssociationEndPropertyStrings value="false"/>
-						<ahasAssociationEndPropertyStringsAShape value="false"/>
-						<ahasAssociationEndPropertyStringsBShape value="false"/>
-						<afromRoleInternalWidth value="-2147483648"/>
-						<afromRoleInternalHeight value="-2147483648"/>
-						<atoRoleInternalWidth value="-2147483648"/>
-						<atoRoleInternalHeight value="-2147483648"/>
-						<afromMultiplicityInternalWidth value="-2147483648"/>
-						<afromMultiplicityInternalHeight value="-2147483648"/>
-						<atoMultiplicityInternalWidth value="-2147483648"/>
-						<atoMultiplicityInternalHeight value="-2147483648"/>
-						<aassociationEndPropertyStringsAInternalWidth value="-2147483648"/>
-						<aassociationEndPropertyStringsAInternalHeight value="-2147483648"/>
-						<aassociationEndPropertyStringsBInternalWidth value="-2147483648"/>
-						<aassociationEndPropertyStringsBInternalHeight value="-2147483648"/>
+			<uml:DiagramElement geometry="510,230;510,259;" preferredShapeType="AssociationClass" subject="XpGhHuyCiu1SNxM0" xmi:id="XpGhHuyCiu1SNxM1">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<captionBounds value="520,264,20,0"/>
+					<captionInternalWidth value="-2147483648"/>
+					<captionInternalHeight value="-2147483648"/>
+					<captionVisible value="true"/>
+					<captionSide value="1"/>
+					<properties>
+						<abackground value="Cr:122,207,245,255"/>
+						<aforeground value="Cr:0,0,0,255"/>
+						<azOrder value="-1"/>
+						<aselectable value="true"/>
+						<arequestResetCaption value="false"/>
+						<arequestResetCaptionSize value="false"/>
+						<aconnectorStyle value="3"/>
+						<aconnectorLineJumps value="4"/>
+						<aconnectorLabelOrientation value="4"/>
+						<afromShapeXDiff value="0"/>
+						<afromShapeYDiff value="0"/>
+						<atoShapeXDiff value="0"/>
+						<atoShapeYDiff value="0"/>
+						<afromConnectType value="0"/>
+						<atoConnectType value="0"/>
+						<auseFromShapeCenter value="true"/>
+						<auseToShapeCenter value="true"/>
+						<afromPinType value="1"/>
+						<atoPinType value="1"/>
+						<arequestRebuild value="false"/>
+						<ashowConnectorName value="2"/>
+						<apaintThroughLabel value="2"/>
 					</properties>
 				</xmi:Extension>
 				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
@@ -14724,7 +15925,7 @@
 			<properties>
 				<apmAuthor value="lavm"/>
 				<apmCreateDateTime value="1337717549249"/>
-				<apmLastModified value="1337717578939"/>
+				<apmLastModified value="1337805933734"/>
 				<ashowPackageNameStyle value="0"/>
 				<ashowConnectorName value="0"/>
 				<apaintConnectorThroughLabel value="0"/>
Binary file model/uml/essentials.png has changed
--- a/model/uml/essentials.svg	Thu May 24 21:48:41 2012 -0400
+++ b/model/uml/essentials.svg	Thu May 24 21:51:11 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="371" stroke-miterlimit="10" stroke-opacity="0" shape-rendering="auto" fill="rgb(0,0,0)" stroke-dasharray="none" font-weight="normal" stroke-width="1" height="342" 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="428" stroke-miterlimit="10" stroke-opacity="0" shape-rendering="auto" fill="rgb(0,0,0)" stroke-dasharray="none" font-weight="normal" stroke-width="1" height="340" 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"
@@ -36,81 +36,87 @@
       ><path d="M0 0 L184 0 L184 154 L0 154 L0 0 Z"
       /></clipPath
       ><clipPath clipPathUnits="userSpaceOnUse" id="clipPath11"
-      ><path d="M-109 -14 L218 -14 L218 28 L-109 28 L-109 -14 Z"
+      ><path d="M0 0 L184 0 L184 184 L0 184 L0 0 Z"
       /></clipPath
       ><clipPath clipPathUnits="userSpaceOnUse" id="clipPath12"
-      ><path d="M-108 -14 L216 -14 L216 28 L-108 28 L-108 -14 Z"
+      ><path d="M-102 -14 L204 -14 L204 28 L-102 28 L-102 -14 Z"
       /></clipPath
       ><clipPath clipPathUnits="userSpaceOnUse" id="clipPath13"
+      ><path d="M-109 -14 L218 -14 L218 28 L-109 28 L-109 -14 Z"
+      /></clipPath
+      ><clipPath clipPathUnits="userSpaceOnUse" id="clipPath14"
+      ><path d="M-108 -14 L216 -14 L216 28 L-108 28 L-108 -14 Z"
+      /></clipPath
+      ><clipPath clipPathUnits="userSpaceOnUse" id="clipPath15"
       ><path d="M-121 -14 L242 -14 L242 28 L-121 28 L-121 -14 Z"
       /></clipPath
-      ><clipPath clipPathUnits="userSpaceOnUse" id="clipPath14"
+      ><clipPath clipPathUnits="userSpaceOnUse" id="clipPath16"
       ><path d="M-46 -14 L92 -14 L92 28 L-46 28 L-46 -14 Z"
       /></clipPath
     ></defs
     ><g fill="white" text-rendering="geometricPrecision" fill-opacity="1" stroke-opacity="1" stroke="white"
-    ><rect x="0" width="371" height="342" y="0" stroke="none"
+    ><rect x="0" width="428" height="340" y="0" stroke="none"
     /></g
-    ><g font-size="11" transform="translate(57,74)" 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"
+    ><g font-size="11" transform="translate(62,72)" 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"
     /></g
-    ><g font-size="11" stroke-linecap="butt" transform="translate(57,74)" 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"
+    ><g font-size="11" stroke-linecap="butt" transform="translate(62,72)" 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="50" y="0" clip-path="url(#clipPath1)"
       /><line y2="14" fill="none" x1="0" clip-path="url(#clipPath1)" x2="80" y1="14"
     /></g
-    ><g font-size="11" transform="translate(57,88)" fill-opacity="1" fill="black" text-rendering="geometricPrecision" font-family="sans-serif" stroke="black" stroke-opacity="1"
+    ><g font-size="11" transform="translate(62,86)" fill-opacity="1" fill="black" text-rendering="geometricPrecision" font-family="sans-serif" stroke="black" stroke-opacity="1"
     ></g
-    ><g font-size="11" transform="translate(57,74)" fill-opacity="1" fill="black" text-rendering="geometricPrecision" font-family="sans-serif" stroke="black" font-weight="bold" stroke-opacity="1"
+    ><g font-size="11" transform="translate(62,72)" fill-opacity="1" fill="black" text-rendering="geometricPrecision" font-family="sans-serif" stroke="black" font-weight="bold" stroke-opacity="1"
     ><text x="23" xml:space="preserve" y="11" clip-path="url(#clipPath3)" stroke="none"
       >Entity</text
     ></g
-    ><g font-size="11" transform="translate(287,74)" 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"
+    ><g font-size="11" transform="translate(292,72)" 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="80" y="0" clip-path="url(#clipPath4)" stroke="none"
     /></g
-    ><g font-size="11" stroke-linecap="butt" transform="translate(287,74)" 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"
+    ><g font-size="11" stroke-linecap="butt" transform="translate(292,72)" 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="80" y="0" clip-path="url(#clipPath4)"
       /><line y2="14" fill="none" x1="0" clip-path="url(#clipPath4)" x2="80" y1="14"
     /></g
-    ><g font-size="11" transform="translate(287,88)" fill-opacity="1" fill="black" text-rendering="geometricPrecision" font-family="sans-serif" stroke="black" stroke-opacity="1"
+    ><g font-size="11" transform="translate(292,86)" fill-opacity="1" fill="black" text-rendering="geometricPrecision" font-family="sans-serif" stroke="black" stroke-opacity="1"
     ></g
-    ><g font-size="11" transform="translate(287,74)" fill-opacity="1" fill="black" text-rendering="geometricPrecision" font-family="sans-serif" stroke="black" font-weight="bold" stroke-opacity="1"
+    ><g font-size="11" transform="translate(292,72)" fill-opacity="1" fill="black" text-rendering="geometricPrecision" font-family="sans-serif" stroke="black" font-weight="bold" stroke-opacity="1"
     ><text x="18" xml:space="preserve" y="11" clip-path="url(#clipPath3)" stroke="none"
       >Activity</text
     ></g
-    ><g font-size="11" transform="translate(57,234)" 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"
+    ><g font-size="11" transform="translate(62,232)" 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"
     /></g
-    ><g font-size="11" stroke-linecap="butt" transform="translate(57,234)" 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"
+    ><g font-size="11" stroke-linecap="butt" transform="translate(62,232)" 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="50" y="0" clip-path="url(#clipPath1)"
       /><line y2="14" fill="none" x1="0" clip-path="url(#clipPath1)" x2="80" y1="14"
     /></g
-    ><g font-size="11" transform="translate(57,248)" fill-opacity="1" fill="black" text-rendering="geometricPrecision" font-family="sans-serif" stroke="black" stroke-opacity="1"
+    ><g font-size="11" transform="translate(62,246)" fill-opacity="1" fill="black" text-rendering="geometricPrecision" font-family="sans-serif" stroke="black" stroke-opacity="1"
     ></g
-    ><g font-size="11" transform="translate(57,234)" fill-opacity="1" fill="black" text-rendering="geometricPrecision" font-family="sans-serif" stroke="black" font-weight="bold" stroke-opacity="1"
+    ><g font-size="11" transform="translate(62,232)" fill-opacity="1" fill="black" text-rendering="geometricPrecision" font-family="sans-serif" stroke="black" font-weight="bold" stroke-opacity="1"
     ><text x="22" xml:space="preserve" y="11" clip-path="url(#clipPath3)" stroke="none"
       >Agent</text
     ></g
-    ><g font-size="11" stroke-linecap="butt" transform="translate(87,44)" fill-opacity="1" fill="black" text-rendering="geometricPrecision" font-family="sans-serif" stroke-linejoin="round" stroke="black" stroke-opacity="1"
+    ><g font-size="11" stroke-linecap="butt" transform="translate(92,42)" 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="199" clip-path="url(#clipPath6)" x2="50" y1="50"
       /><line y2="56" fill="none" x1="50" clip-path="url(#clipPath6)" x2="62" y1="50"
       /><line y2="44" fill="none" x1="50" clip-path="url(#clipPath6)" x2="62" y1="50"
     /></g
-    ><g font-size="11" stroke-linecap="butt" transform="translate(87,64)" fill-opacity="1" fill="black" text-rendering="geometricPrecision" font-family="sans-serif" stroke-linejoin="round" stroke="black" stroke-opacity="1"
+    ><g font-size="11" stroke-linecap="butt" transform="translate(92,62)" 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(#clipPath6)" x2="199" y1="50"
       /><line y2="44" fill="none" x1="199" clip-path="url(#clipPath6)" x2="187" y1="50"
       /><line y2="56" fill="none" x1="199" clip-path="url(#clipPath6)" x2="187" y1="50"
     /></g
-    ><g font-size="11" stroke-linecap="butt" transform="translate(77,74)" fill-opacity="1" fill="black" text-rendering="geometricPrecision" font-family="sans-serif" stroke-linejoin="round" stroke="black" stroke-opacity="1"
+    ><g font-size="11" stroke-linecap="butt" transform="translate(82,72)" fill-opacity="1" fill="black" text-rendering="geometricPrecision" font-family="sans-serif" stroke-linejoin="round" stroke="black" stroke-opacity="1"
     ><line y2="159" fill="none" x1="50" clip-path="url(#clipPath7)" x2="50" y1="50"
       /><line y2="147" fill="none" x1="50" clip-path="url(#clipPath7)" x2="56" y1="159"
       /><line y2="147" fill="none" x1="50" clip-path="url(#clipPath7)" x2="44" y1="159"
     /></g
-    ><g font-size="11" stroke-linecap="butt" transform="translate(87,103)" fill-opacity="1" fill="black" text-rendering="geometricPrecision" font-family="sans-serif" stroke-linejoin="round" stroke="black" stroke-opacity="1"
+    ><g font-size="11" stroke-linecap="butt" transform="translate(92,101)" fill-opacity="1" fill="black" text-rendering="geometricPrecision" font-family="sans-serif" stroke-linejoin="round" stroke="black" stroke-opacity="1"
     ><line y2="132" fill="none" x1="200" clip-path="url(#clipPath8)" x2="50" y1="50"
       /><line y2="132" fill="none" x1="50" clip-path="url(#clipPath8)" x2="63" y1="132"
       /><line y2="121" fill="none" x1="50" clip-path="url(#clipPath8)" x2="57" y1="132"
     /></g
-    ><g font-size="11" stroke-linecap="butt" transform="translate(-43,-16)" fill-opacity="1" fill="black" text-rendering="geometricPrecision" font-family="sans-serif" stroke-linejoin="round" stroke="black" stroke-opacity="1"
+    ><g font-size="11" stroke-linecap="butt" transform="translate(-38,-18)" 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="140" clip-path="url(#clipPath9)" x2="140" y1="89"
       /><line y2="50" fill="none" x1="140" clip-path="url(#clipPath9)" x2="50" y1="50"
       /><line y2="110" fill="none" x1="50" clip-path="url(#clipPath9)" x2="50" y1="50"
@@ -118,7 +124,7 @@
       /><line y2="77" fill="none" x1="140" clip-path="url(#clipPath9)" x2="146" y1="89"
       /><line y2="77" fill="none" x1="140" clip-path="url(#clipPath9)" x2="134" y1="89"
     /></g
-    ><g font-size="11" stroke-linecap="butt" transform="translate(47,204)" fill-opacity="1" fill="black" text-rendering="geometricPrecision" font-family="sans-serif" stroke-linejoin="round" stroke="black" stroke-opacity="1"
+    ><g font-size="11" stroke-linecap="butt" transform="translate(52,202)" fill-opacity="1" fill="black" text-rendering="geometricPrecision" font-family="sans-serif" stroke-linejoin="round" stroke="black" stroke-opacity="1"
     ><line y2="100" fill="none" x1="50" clip-path="url(#clipPath10)" x2="50" y1="80"
       /><line y2="100" fill="none" x1="50" clip-path="url(#clipPath10)" x2="130" y1="100"
       /><line y2="50" fill="none" x1="130" clip-path="url(#clipPath10)" x2="130" y1="100"
@@ -126,28 +132,40 @@
       /><line y2="56" fill="none" x1="90" clip-path="url(#clipPath10)" x2="102" y1="50"
       /><line y2="44" fill="none" x1="90" clip-path="url(#clipPath10)" x2="102" y1="50"
     /></g
-    ><g font-size="11" transform="translate(77,324)" 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(#clipPath11)" stroke="none"
+    ><g font-size="11" stroke-linecap="butt" transform="translate(282,-18)" 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(#clipPath11)" x2="50" y1="89"
+      /><line y2="50" fill="none" x1="50" clip-path="url(#clipPath11)" x2="130" y1="50"
+      /><line y2="130" fill="none" x1="130" clip-path="url(#clipPath11)" x2="130" y1="50"
+      /><line y2="130" fill="none" x1="130" clip-path="url(#clipPath11)" x2="90" y1="130"
+      /><line y2="77" fill="none" x1="50" clip-path="url(#clipPath11)" x2="56" y1="89"
+      /><line y2="77" fill="none" x1="50" clip-path="url(#clipPath11)" x2="44" y1="89"
+    /></g
+    ><g font-size="11" transform="translate(322,2)" fill-opacity="1" fill="black" text-rendering="geometricPrecision" font-family="sans-serif" stroke="black" stroke-opacity="1"
+    ><text x="10" xml:space="preserve" y="11" clip-path="url(#clipPath12)" stroke="none"
+      >wasInformedBy</text
+    ></g
+    ><g font-size="11" transform="translate(82,322)" 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(#clipPath13)" stroke="none"
       >actedOnBehalfOf</text
     ></g
     ><g font-size="11" transform="translate(2,2)" 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(#clipPath12)" stroke="none"
+    ><text x="9" xml:space="preserve" y="11" clip-path="url(#clipPath14)" stroke="none"
       >wasDerivedFrom</text
     ></g
-    ><g font-size="11" transform="translate(207,204)" 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(#clipPath13)" stroke="none"
+    ><g font-size="11" transform="translate(211,202)" 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(#clipPath15)" stroke="none"
       >wasAssociatedWith</text
     ></g
-    ><g font-size="11" transform="translate(27,164)" 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(#clipPath12)" stroke="none"
+    ><g font-size="11" transform="translate(32,162)" 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(#clipPath14)" stroke="none"
       >wasAttributedTo</text
     ></g
-    ><g font-size="11" transform="translate(157,124)" 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(#clipPath12)" stroke="none"
+    ><g font-size="11" transform="translate(162,122)" 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(#clipPath14)" stroke="none"
       >wasGeneratedBy</text
     ></g
-    ><g font-size="11" transform="translate(189,74)" 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(#clipPath14)" stroke="none"
+    ><g font-size="11" transform="translate(194,72)" 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(#clipPath16)" stroke="none"
       >used</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)"
--- a/model/uml/essentials.xmi	Thu May 24 21:48:41 2012 -0400
+++ b/model/uml/essentials.xmi	Thu May 24 21:51:11 2012 -0400
@@ -2167,7 +2167,7 @@
 								<property name="fillColorGradientStyle" type="int" value="1"/>
 								<property name="fillColorTransparency" type="int" value="0"/>
 								<property name="fillColorColor1" type="int" value="-8728587"/>
-								<property name="fillColorColor2" type="int" value="0"/>
+								<property name="fillColorColor2" type="int" value="-8728587"/>
 							</properties>
 						</vpumlModel>
 						<vpumlModel id="XndDmuyEwTiAAgDg" modelType="ProjectFillColorModel">
@@ -5153,13 +5153,14 @@
 						<property htmlValue="" name="documentation" type="htmlString" value=""/>
 						<property name="pmAuthor" type="string" value="lavm"/>
 						<property name="pmCreateDateTime" type="string" value="1337241303538"/>
-						<property name="pmLastModified" type="string" value="1337259149436"/>
+						<property name="pmLastModified" type="string" value="1337755466316"/>
 						<property name="qualityScore" type="int" value="-1"/>
 					</properties>
 					<vpumlChildModelRefs>
 						<modelRef value="T59TmuyEwTiAAgNZ"/>
 						<modelRef value="Bu5UWuyEwTiAAgSF"/>
 						<modelRef value="XhLbWuyEwTiAAgjM"/>
+						<modelRef value="Ul4OHuyCiu1SNxIB"/>
 					</vpumlChildModelRefs>
 					<vpumlChildModels>
 						<vpumlModel id="T59TmuyEwTiAAgNZ" modelType="ModelRelationshipContainer">
@@ -5169,7 +5170,7 @@
 								<property htmlValue="" name="documentation" type="htmlString" value=""/>
 								<property name="pmAuthor" type="string" value="lavm"/>
 								<property name="pmCreateDateTime" type="string" value="1337241303538"/>
-								<property name="pmLastModified" type="string" value="1337357533277"/>
+								<property name="pmLastModified" type="string" value="1337875861982"/>
 								<property name="qualityScore" type="int" value="-1"/>
 							</properties>
 							<vpumlChildModelRefs>
@@ -5196,6 +5197,30 @@
 								<modelRef value="Uf5tBuyCiu1SNwgY"/>
 								<modelRef value="CNrtBuyCiu1SNwgz"/>
 								<modelRef value="CqftBuyCiu1SNwhD"/>
+								<modelRef value="fOWGjuyCiu1SNwnM"/>
+								<modelRef value="t7OGjuyCiu1SNwnU"/>
+								<modelRef value="1YFGjuyCiu1SNwnk"/>
+								<modelRef value="qKNGjuyCiu1SNwnu"/>
+								<modelRef value="yvTGjuyCiu1SNwn8"/>
+								<modelRef value="fyAmjuyCiu1SNwoH"/>
+								<modelRef value="uYgRzuyCiu1SNwyI"/>
+								<modelRef value="tG7RzuyCiu1SNwzq"/>
+								<modelRef value="iyCxzuyCiu1SNw0N"/>
+								<modelRef value="AHUpzuyCiu1SNw2V"/>
+								<modelRef value="UOcpzuyCiu1SNw2h"/>
+								<modelRef value="FwURLuyCiu1SNw4J"/>
+								<modelRef value="ODGRLuyCiu1SNw4f"/>
+								<modelRef value="mBJRLuyCiu1SNw4z"/>
+								<modelRef value="b1USbuyCiu1SNxFU"/>
+								<modelRef value="gCsSbuyCiu1SNxFe"/>
+								<modelRef value="MMoybuyCiu1SNxF6"/>
+								<modelRef value="QjBybuyCiu1SNxGg"/>
+								<modelRef value="m4aBHuyCiu1SNxLY"/>
+								<modelRef value="ghXBHuyCiu1SNxMM"/>
+								<modelRef value="SA4hHuyCiu1SNxMa"/>
+								<modelRef value="pKq8nuyCiu1SNxPl"/>
+								<modelRef value="eWBu3uyCiu1SNxXO"/>
+								<modelRef value="1MC5_uyCiu1SNxbJ"/>
 							</vpumlChildModelRefs>
 						</vpumlModel>
 						<vpumlModel id="Bu5UWuyEwTiAAgSF" modelType="ModelRelationshipContainer">
@@ -5205,7 +5230,7 @@
 								<property htmlValue="" name="documentation" type="htmlString" value=""/>
 								<property name="pmAuthor" type="string" value="lavm"/>
 								<property name="pmCreateDateTime" type="string" value="1337247561568"/>
-								<property name="pmLastModified" type="string" value="1337331644281"/>
+								<property name="pmLastModified" type="string" value="1337769103088"/>
 								<property name="qualityScore" type="int" value="-1"/>
 							</properties>
 							<vpumlChildModelRefs>
@@ -5219,6 +5244,14 @@
 								<modelRef value="fUCTeuyCiu1SNwWy"/>
 								<modelRef value="tqk0.uyCiu1SNwZx"/>
 								<modelRef value="blc0.uyCiu1SNwZ3"/>
+								<modelRef value="N.hRzuyCiu1SNwzM"/>
+								<modelRef value="1DMxzuyCiu1SNw0F"/>
+								<modelRef value="FMPxzuyCiu1SNw08"/>
+								<modelRef value="eyqRLuyCiu1SNw4b"/>
+								<modelRef value="fpOybuyCiu1SNxGW"/>
+								<modelRef value="Lu.BHuyCiu1SNxLr"/>
+								<modelRef value="XpGhHuyCiu1SNxM0"/>
+								<modelRef value="P7f8nuyCiu1SNxQU"/>
 							</vpumlChildModelRefs>
 						</vpumlModel>
 						<vpumlModel id="XhLbWuyEwTiAAgjM" modelType="ModelRelationshipContainer">
@@ -5228,15 +5261,55 @@
 								<property htmlValue="" name="documentation" type="htmlString" value=""/>
 								<property name="pmAuthor" type="string" value="lavm"/>
 								<property name="pmCreateDateTime" type="string" value="1337259149434"/>
-								<property name="pmLastModified" type="string" value="1337331644282"/>
+								<property name="pmLastModified" type="string" value="1337805539425"/>
 								<property name="qualityScore" type="int" value="-1"/>
 							</properties>
 							<vpumlChildModelRefs>
 								<modelRef value="c8WbWuyEwTiAAgig"/>
 								<modelRef value="6eo0.uyCiu1SNwZp"/>
 								<modelRef value="cW40.uyCiu1SNwZt"/>
+								<modelRef value="cELRzuyCiu1SNwzd"/>
+								<modelRef value="gt_hLuyCiu1SNw4A"/>
+								<modelRef value="3iRJLuyCiu1SNw6t"/>
+								<modelRef value="ouFJLuyCiu1SNw6_"/>
+								<modelRef value="BHNW3uyCiu1SNxT2"/>
+								<modelRef value="tJTW3uyCiu1SNxT."/>
+								<modelRef value="oCw23uyCiu1SNxUT"/>
 							</vpumlChildModelRefs>
 						</vpumlModel>
+						<vpumlModel id="Ul4OHuyCiu1SNxIB" modelType="ModelRelationshipContainer">
+							<properties>
+								<property name="name" type="string" value="Anchor"/>
+								<property name="modelType" type="string" value="ModelRelationshipContainer"/>
+								<property htmlValue="" name="documentation" type="htmlString" value=""/>
+								<property name="pmAuthor" type="string" value="lavm"/>
+								<property name="pmCreateDateTime" type="string" value="1337755466314"/>
+								<property name="pmLastModified" type="string" value="1337755909228"/>
+								<property name="qualityScore" type="int" value="-1"/>
+							</properties>
+							<vpumlChildModelRefs>
+								<modelRef value="EOr2HuyCiu1SNxHr"/>
+								<modelRef value="lK0uHuyCiu1SNxI7"/>
+								<modelRef value="qlVuHuyCiu1SNxJg"/>
+							</vpumlChildModelRefs>
+							<vpumlChildModels>
+								<ownedMember from="afB2HuyCiu1SNxHe" to="24s2HuyCiu1SNxHD" xmi:id="EOr2HuyCiu1SNxHr" xmi:type="anchor">
+									<xmi:Extension extender="Visual Paradigm for UML">
+										<qualityScore value="100"/>
+									</xmi:Extension>
+								</ownedMember>
+								<ownedMember from="afB2HuyCiu1SNxHe" to="XHTOHuyCiu1SNxIe" xmi:id="lK0uHuyCiu1SNxI7" xmi:type="anchor">
+									<xmi:Extension extender="Visual Paradigm for UML">
+										<qualityScore value="100"/>
+									</xmi:Extension>
+								</ownedMember>
+								<ownedMember from="afB2HuyCiu1SNxHe" to="yr2uHuyCiu1SNxJW" xmi:id="qlVuHuyCiu1SNxJg" xmi:type="anchor">
+									<xmi:Extension extender="Visual Paradigm for UML">
+										<qualityScore value="100"/>
+									</xmi:Extension>
+								</ownedMember>
+							</vpumlChildModels>
+						</vpumlModel>
 					</vpumlChildModels>
 				</vpumlModel>
 				<vpumlModel id="K3dDmuyEwTiAAgHc" modelType="ValueSpecification">
@@ -5936,8 +6009,17 @@
 			<xmi:Extension extender="Visual Paradigm for UML">
 				<isRoot xmi:value="false"/>
 				<modelType value="Class"/>
-				<association isAbstract="false" isDerived="false" isLeaf="false" name="wasEndedBy" xmi:id="f1p0WuyEwTiAAgTE"/>
-				<associationClass from="f1p0WuyEwTiAAgTE" to="_i1UWuyEwTiAAgSK" xmi:id="9G50WuyEwTiAAgTM"/>
+				<association isAbstract="false" isDerived="false" isLeaf="false" name="wasEndedBy" xmi:id="f1p0WuyEwTiAAgTE">
+					<xmi:Extension extender="Visual Paradigm for UML">
+						<taggedValue tag="test" value="" xmi:id="aUjYbuyCiu1SNw9h" xmi:type="uml:TaggedValue">
+							<xmi:Extension extender="Visual Paradigm for UML">
+								<type value="0"/>
+								<qualityScore value="-1"/>
+							</xmi:Extension>
+						</taggedValue>
+					</xmi:Extension>
+				</association>
+				<associationClass from="f1p0WuyEwTiAAgTE" name="" to="_i1UWuyEwTiAAgSK" xmi:id="9G50WuyEwTiAAgTM"/>
 				<businessModel xmi:value="false"/>
 				<qualityScore value="92"/>
 				<qualityReason value="1&#9;1&#10;2&#9;2"/>
@@ -5982,7 +6064,7 @@
 							<property htmlValue="" name="documentation" type="htmlString" value=""/>
 							<property name="pmAuthor" type="string" value="lavm"/>
 							<property name="pmCreateDateTime" type="string" value="1337356664491"/>
-							<property name="pmLastModified" type="string" value="1337356993019"/>
+							<property name="pmLastModified" type="string" value="1337718974393"/>
 							<property name="qualityScore" type="int" value="100"/>
 						</properties>
 					</vpumlModel>
@@ -5997,313 +6079,22 @@
 							<property name="qualityScore" type="int" value="100"/>
 						</properties>
 					</vpumlModel>
+					<vpumlModel id="24s2HuyCiu1SNxHD" modelType="ShapeEditorShape">
+						<properties>
+							<property name="name" type="string" value=""/>
+							<property name="modelType" type="string" value="ShapeEditorShape"/>
+							<property htmlValue="" name="documentation" type="htmlString" value=""/>
+							<property name="pmAuthor" type="string" value="lavm"/>
+							<property name="pmCreateDateTime" type="string" value="1337755226587"/>
+							<property name="pmLastModified" type="string" value="1337755466370"/>
+							<property name="qualityScore" type="int" value="100"/>
+						</properties>
+					</vpumlModel>
 				</vpumlChildModels>
 				<qualityScore value="26"/>
 				<qualityReason value="2&#9;2&#10;5&#9;5"/>
 				<subdiagram xmi:value="EUejmuyEwTiAAgLc"/>
 			</xmi:Extension>
-			<ownedMember isAbstract="false" isActive="false" isLeaf="false" name="Entity" visibility="public" xmi:id="m6xjmuyEwTiAAgLk" xmi:type="uml:Class">
-				<xmi:Extension extender="Visual Paradigm for UML">
-					<isRoot xmi:value="false"/>
-					<modelType value="Class"/>
-					<businessModel xmi:value="false"/>
-					<qualityScore value="97"/>
-					<qualityReason value="2&#9;2"/>
-				</xmi:Extension>
-				<ownedAttribute aggregation="none" isDerived="false" name="id" ownerScope="instance" xmi:id="SlsYWuyEwTiAAgOj" xmi:type="uml:Property">
-					<xmi:Extension extender="Visual Paradigm for UML">
-						<attribute/>
-						<isVisble xmi:value="true"/>
-						<qualityScore value="97"/>
-						<qualityReason value="2&#9;2"/>
-					</xmi:Extension>
-				</ownedAttribute>
-				<ownedAttribute aggregation="none" isDerived="false" name="attributes" ownerScope="instance" xmi:id="z1RYWuyEwTiAAgOn" xmi:type="uml:Property">
-					<xmi:Extension extender="Visual Paradigm for UML">
-						<attribute/>
-						<isVisble xmi:value="true"/>
-						<qualityScore value="97"/>
-						<qualityReason value="2&#9;2"/>
-					</xmi:Extension>
-				</ownedAttribute>
-				<ownedAttribute aggregation="none" association="_i1UWuyEwTiAAgSK" isDerived="false" type="vTljmuyEwTiAAgLp" xmi:id="f1p0WuyEwTiAAgTF" xmi:type="uml:Property">
-					<xmi:Extension extender="Visual Paradigm for UML">
-						<associationEnd/>
-						<qualifier name="" xmi:id="f1p0WuyEwTiAAgTG" xmi:type="qualifier">
-							<xmi:Extension extender="Visual Paradigm for UML">
-								<qualityScore value="-1"/>
-							</xmi:Extension>
-						</qualifier>
-						<qualityScore value="95"/>
-						<qualityReason value="1&#9;1"/>
-					</xmi:Extension>
-				</ownedAttribute>
-				<ownedAttribute aggregation="none" association="9un1WuyEwTiAAgcK" isDerived="false" isNavigable="true" type="vTljmuyEwTiAAgLp" xmi:id="WzlMWuyEwTiAAgT7" xmi:type="uml:Property">
-					<xmi:Extension extender="Visual Paradigm for UML">
-						<associationEnd/>
-						<qualifier name="" xmi:id="WzlMWuyEwTiAAgT8" xmi:type="qualifier">
-							<xmi:Extension extender="Visual Paradigm for UML">
-								<qualityScore value="100"/>
-							</xmi:Extension>
-						</qualifier>
-						<qualityScore value="95"/>
-						<qualityReason value="1&#9;1"/>
-					</xmi:Extension>
-				</ownedAttribute>
-				<ownedAttribute aggregation="none" association="q8f1WuyEwTiAAgcQ" isDerived="false" isNavigable="true" type="vTljmuyEwTiAAgLp" xmi:id="JsssWuyEwTiAAgU8" xmi:type="uml:Property">
-					<xmi:Extension extender="Visual Paradigm for UML">
-						<associationEnd/>
-						<qualifier name="" xmi:id="JsssWuyEwTiAAgU9" xmi:type="qualifier">
-							<xmi:Extension extender="Visual Paradigm for UML">
-								<qualityScore value="-1"/>
-							</xmi:Extension>
-						</qualifier>
-						<qualityScore value="95"/>
-						<qualityReason value="1&#9;1"/>
-					</xmi:Extension>
-				</ownedAttribute>
-				<ownedAttribute aggregation="none" association="tkL1WuyEwTiAAgcE" isDerived="false" type="vTljmuyEwTiAAgLp" xmi:id="oXsuWuyEwTiAAgWr" xmi:type="uml:Property">
-					<xmi:Extension extender="Visual Paradigm for UML">
-						<associationEnd/>
-						<qualifier name="" xmi:id="oXsuWuyEwTiAAgWs" xmi:type="qualifier">
-							<xmi:Extension extender="Visual Paradigm for UML">
-								<qualityScore value="-1"/>
-							</xmi:Extension>
-						</qualifier>
-						<qualityScore value="95"/>
-						<qualityReason value="1&#9;1"/>
-					</xmi:Extension>
-				</ownedAttribute>
-				<ownedAttribute aggregation="none" association="LvBeWuyEwTiAAgYC" isDerived="false" name="" type="vTljmuyEwTiAAgLp" xmi:id="wuw.WuyEwTiAAgYZ" xmi:type="uml:Property">
-					<xmi:Extension extender="Visual Paradigm for UML">
-						<associationEnd/>
-						<qualifier name="" xmi:id="wuw.WuyEwTiAAgYa" xmi:type="qualifier">
-							<xmi:Extension extender="Visual Paradigm for UML">
-								<qualityScore value="-1"/>
-							</xmi:Extension>
-						</qualifier>
-						<qualityScore value="95"/>
-						<qualityReason value="1&#9;1"/>
-					</xmi:Extension>
-				</ownedAttribute>
-				<ownedAttribute aggregation="none" association="7_3LWuyEwTiAAggX" isDerived="false" type="m6xjmuyEwTiAAgLk" xmi:id="LrnLWuyEwTiAAggR" xmi:type="uml:Property">
-					<xmi:Extension extender="Visual Paradigm for UML">
-						<associationEnd/>
-						<qualifier name="" xmi:id="LrnLWuyEwTiAAggS" xmi:type="qualifier">
-							<xmi:Extension extender="Visual Paradigm for UML">
-								<qualityScore value="-1"/>
-							</xmi:Extension>
-						</qualifier>
-						<qualityScore value="95"/>
-						<qualityReason value="1&#9;1"/>
-					</xmi:Extension>
-				</ownedAttribute>
-				<ownedAttribute aggregation="none" association="7_3LWuyEwTiAAggX" isDerived="false" isNavigable="true" type="m6xjmuyEwTiAAgLk" xmi:id="LrnLWuyEwTiAAggP" xmi:type="uml:Property">
-					<xmi:Extension extender="Visual Paradigm for UML">
-						<associationEnd/>
-						<qualifier name="" xmi:id="LrnLWuyEwTiAAggQ" xmi:type="qualifier">
-							<xmi:Extension extender="Visual Paradigm for UML">
-								<qualityScore value="-1"/>
-							</xmi:Extension>
-						</qualifier>
-						<qualityScore value="-1"/>
-					</xmi:Extension>
-				</ownedAttribute>
-				<ownedAttribute aggregation="none" association="iwsbWuyEwTiAAgiT" isDerived="false" type="m6xjmuyEwTiAAgLk" xmi:id="H7xbWuyEwTiAAgi3" xmi:type="uml:Property">
-					<xmi:Extension extender="Visual Paradigm for UML">
-						<associationEnd/>
-						<qualifier name="" xmi:id="H7xbWuyEwTiAAgi4" xmi:type="qualifier">
-							<xmi:Extension extender="Visual Paradigm for UML">
-								<qualityScore value="-1"/>
-							</xmi:Extension>
-						</qualifier>
-						<qualityScore value="-1"/>
-					</xmi:Extension>
-				</ownedAttribute>
-				<ownedAttribute aggregation="none" association="iwsbWuyEwTiAAgiT" isDerived="false" isNavigable="true" type="m6xjmuyEwTiAAgLk" xmi:id="77xbWuyEwTiAAgi1" xmi:type="uml:Property">
-					<xmi:Extension extender="Visual Paradigm for UML">
-						<associationEnd/>
-						<qualifier name="" xmi:id="77xbWuyEwTiAAgi2" xmi:type="qualifier">
-							<xmi:Extension extender="Visual Paradigm for UML">
-								<qualityScore value="-1"/>
-							</xmi:Extension>
-						</qualifier>
-						<qualityScore value="-1"/>
-					</xmi:Extension>
-				</ownedAttribute>
-				<ownedAttribute aggregation="none" association="ZKXU.uyCiu1SNwZb" isDerived="false" type="m6xjmuyEwTiAAgLk" xmi:id="gi8U.uyCiu1SNwYp" xmi:type="uml:Property">
-					<xmi:Extension extender="Visual Paradigm for UML">
-						<associationEnd/>
-						<qualifier name="" xmi:id="gi8U.uyCiu1SNwYq" xmi:type="qualifier">
-							<xmi:Extension extender="Visual Paradigm for UML">
-								<qualityScore value="-1"/>
-							</xmi:Extension>
-						</qualifier>
-						<qualityScore value="95"/>
-						<qualityReason value="1&#9;1"/>
-					</xmi:Extension>
-				</ownedAttribute>
-				<ownedAttribute aggregation="none" association="ZKXU.uyCiu1SNwZb" isDerived="false" isNavigable="true" type="m6xjmuyEwTiAAgLk" xmi:id="gi8U.uyCiu1SNwYn" xmi:type="uml:Property">
-					<xmi:Extension extender="Visual Paradigm for UML">
-						<associationEnd/>
-						<qualifier name="" xmi:id="gi8U.uyCiu1SNwYo" xmi:type="qualifier">
-							<xmi:Extension extender="Visual Paradigm for UML">
-								<qualityScore value="-1"/>
-							</xmi:Extension>
-						</qualifier>
-						<qualityScore value="95"/>
-						<qualityReason value="1&#9;1"/>
-					</xmi:Extension>
-				</ownedAttribute>
-				<ownedAttribute aggregation="none" association="W8Q0.uyCiu1SNwZl" isDerived="false" name="" type="m6xjmuyEwTiAAgLk" xmi:id="D2RU.uyCiu1SNwZD" xmi:type="uml:Property">
-					<xmi:Extension extender="Visual Paradigm for UML">
-						<associationEnd/>
-						<qualifier name="" xmi:id="D2RU.uyCiu1SNwZE" xmi:type="qualifier">
-							<xmi:Extension extender="Visual Paradigm for UML">
-								<qualityScore value="-1"/>
-							</xmi:Extension>
-						</qualifier>
-						<qualityScore value="-1"/>
-					</xmi:Extension>
-				</ownedAttribute>
-				<ownedAttribute aggregation="none" association="W8Q0.uyCiu1SNwZl" isDerived="false" isNavigable="true" type="m6xjmuyEwTiAAgLk" xmi:id="D2RU.uyCiu1SNwZB" xmi:type="uml:Property">
-					<xmi:Extension extender="Visual Paradigm for UML">
-						<associationEnd/>
-						<qualifier name="" xmi:id="D2RU.uyCiu1SNwZC" xmi:type="qualifier">
-							<xmi:Extension extender="Visual Paradigm for UML">
-								<qualityScore value="-1"/>
-							</xmi:Extension>
-						</qualifier>
-						<qualityScore value="-1"/>
-					</xmi:Extension>
-				</ownedAttribute>
-			</ownedMember>
-			<ownedMember isAbstract="false" isActive="false" isLeaf="false" name="Activity" visibility="public" xmi:id="vTljmuyEwTiAAgLp" xmi:type="uml:Class">
-				<xmi:Extension extender="Visual Paradigm for UML">
-					<isRoot xmi:value="false"/>
-					<modelType value="Class"/>
-					<businessModel xmi:value="false"/>
-					<qualityScore value="97"/>
-					<qualityReason value="2&#9;2"/>
-				</xmi:Extension>
-				<ownedAttribute aggregation="none" isDerived="false" name="id" ownerScope="instance" xmi:id="G3u4WuyEwTiAAgPd" xmi:type="uml:Property">
-					<xmi:Extension extender="Visual Paradigm for UML">
-						<attribute/>
-						<isVisble xmi:value="true"/>
-						<qualityScore value="97"/>
-						<qualityReason value="2&#9;2"/>
-					</xmi:Extension>
-					<lowerValue value="1" xmi:id="G3u4WuyEwTiAAgPd_multiplicity_lowerValue" xmi:type="uml:LiteralString"/>
-				</ownedAttribute>
-				<ownedAttribute aggregation="none" isDerived="false" name="startTime" ownerScope="instance" xmi:id="fa44WuyEwTiAAgPN" xmi:type="uml:Property">
-					<xmi:Extension extender="Visual Paradigm for UML">
-						<attribute/>
-						<isVisble xmi:value="true"/>
-						<qualityScore value="97"/>
-						<qualityReason value="2&#9;2"/>
-					</xmi:Extension>
-					<lowerValue value="0" xmi:id="fa44WuyEwTiAAgPN_multiplicity_lowerValue" xmi:type="uml:LiteralString"/>
-					<upperValue value="1" xmi:id="fa44WuyEwTiAAgPN_multiplicity_upperValue" xmi:type="uml:LiteralString"/>
-				</ownedAttribute>
-				<ownedAttribute aggregation="none" isDerived="false" name="endTime" ownerScope="instance" xmi:id="mJi4WuyEwTiAAgPP" xmi:type="uml:Property">
-					<xmi:Extension extender="Visual Paradigm for UML">
-						<attribute/>
-						<isVisble xmi:value="true"/>
-						<qualityScore value="97"/>
-						<qualityReason value="2&#9;2"/>
-					</xmi:Extension>
-					<lowerValue value="0" xmi:id="mJi4WuyEwTiAAgPP_multiplicity_lowerValue" xmi:type="uml:LiteralString"/>
-					<upperValue value="1" xmi:id="mJi4WuyEwTiAAgPP_multiplicity_upperValue" xmi:type="uml:LiteralString"/>
-				</ownedAttribute>
-				<ownedAttribute aggregation="none" isDerived="false" name="attributes" ownerScope="instance" xmi:id="Wz64WuyEwTiAAgPY" xmi:type="uml:Property">
-					<xmi:Extension extender="Visual Paradigm for UML">
-						<attribute/>
-						<isVisble xmi:value="true"/>
-						<qualityScore value="97"/>
-						<qualityReason value="2&#9;2"/>
-					</xmi:Extension>
-				</ownedAttribute>
-				<ownedAttribute aggregation="none" association="_i1UWuyEwTiAAgSK" isDerived="false" isNavigable="true" name="trigger" type="m6xjmuyEwTiAAgLk" xmi:id="_1p0WuyEwTiAAgTH" xmi:type="uml:Property">
-					<xmi:Extension extender="Visual Paradigm for UML">
-						<associationEnd/>
-						<qualifier name="" xmi:id="_1p0WuyEwTiAAgTI" xmi:type="qualifier">
-							<xmi:Extension extender="Visual Paradigm for UML">
-								<qualityScore value="-1"/>
-							</xmi:Extension>
-						</qualifier>
-						<qualityScore value="92"/>
-						<qualityReason value="1&#9;1&#10;2&#9;2"/>
-					</xmi:Extension>
-				</ownedAttribute>
-				<ownedAttribute aggregation="none" association="9un1WuyEwTiAAgcK" isDerived="false" type="m6xjmuyEwTiAAgLk" xmi:id="WzlMWuyEwTiAAgT9" xmi:type="uml:Property">
-					<xmi:Extension extender="Visual Paradigm for UML">
-						<associationEnd/>
-						<qualifier name="" xmi:id="WzlMWuyEwTiAAgT." xmi:type="qualifier">
-							<xmi:Extension extender="Visual Paradigm for UML">
-								<qualityScore value="100"/>
-							</xmi:Extension>
-						</qualifier>
-						<qualityScore value="95"/>
-						<qualityReason value="1&#9;1"/>
-					</xmi:Extension>
-				</ownedAttribute>
-				<ownedAttribute aggregation="none" association="q8f1WuyEwTiAAgcQ" isDerived="false" type="m6xjmuyEwTiAAgLk" xmi:id="JsssWuyEwTiAAgU6" xmi:type="uml:Property">
-					<xmi:Extension extender="Visual Paradigm for UML">
-						<associationEnd/>
-						<qualifier name="" xmi:id="JsssWuyEwTiAAgU7" xmi:type="qualifier">
-							<xmi:Extension extender="Visual Paradigm for UML">
-								<qualityScore value="-1"/>
-							</xmi:Extension>
-						</qualifier>
-						<qualityScore value="-1"/>
-					</xmi:Extension>
-				</ownedAttribute>
-				<ownedAttribute aggregation="none" association="tkL1WuyEwTiAAgcE" isDerived="false" isNavigable="true" type="m6xjmuyEwTiAAgLk" xmi:id="oXsuWuyEwTiAAgWt" xmi:type="uml:Property">
-					<xmi:Extension extender="Visual Paradigm for UML">
-						<associationEnd/>
-						<qualifier name="" xmi:id="oXsuWuyEwTiAAgWu" xmi:type="qualifier">
-							<xmi:Extension extender="Visual Paradigm for UML">
-								<qualityScore value="-1"/>
-							</xmi:Extension>
-						</qualifier>
-						<qualityScore value="-1"/>
-					</xmi:Extension>
-				</ownedAttribute>
-				<ownedAttribute aggregation="none" association="LvBeWuyEwTiAAgYC" isDerived="false" isNavigable="true" name="trigger" type="m6xjmuyEwTiAAgLk" xmi:id="wuw.WuyEwTiAAgYb" xmi:type="uml:Property">
-					<xmi:Extension extender="Visual Paradigm for UML">
-						<associationEnd/>
-						<qualifier name="" xmi:id="wuw.WuyEwTiAAgYc" xmi:type="qualifier">
-							<xmi:Extension extender="Visual Paradigm for UML">
-								<qualityScore value="-1"/>
-							</xmi:Extension>
-						</qualifier>
-						<qualityScore value="92"/>
-						<qualityReason value="1&#9;1&#10;2&#9;2"/>
-					</xmi:Extension>
-				</ownedAttribute>
-				<ownedAttribute aggregation="none" association="cSnjeuyCiu1SNwVU" isDerived="false" isNavigable="true" type="vTljmuyEwTiAAgLp" xmi:id="g1DjeuyCiu1SNwVE" xmi:type="uml:Property">
-					<xmi:Extension extender="Visual Paradigm for UML">
-						<associationEnd/>
-						<qualifier name="" xmi:id="g1DjeuyCiu1SNwVF" xmi:type="qualifier">
-							<xmi:Extension extender="Visual Paradigm for UML">
-								<qualityScore value="-1"/>
-							</xmi:Extension>
-						</qualifier>
-						<qualityScore value="-1"/>
-					</xmi:Extension>
-				</ownedAttribute>
-				<ownedAttribute aggregation="none" association="cSnjeuyCiu1SNwVU" isDerived="false" type="vTljmuyEwTiAAgLp" xmi:id="g1DjeuyCiu1SNwVC" xmi:type="uml:Property">
-					<xmi:Extension extender="Visual Paradigm for UML">
-						<associationEnd/>
-						<qualifier name="" xmi:id="g1DjeuyCiu1SNwVD" xmi:type="qualifier">
-							<xmi:Extension extender="Visual Paradigm for UML">
-								<qualityScore value="-1"/>
-							</xmi:Extension>
-						</qualifier>
-						<qualityScore value="-1"/>
-					</xmi:Extension>
-				</ownedAttribute>
-			</ownedMember>
 			<ownedMember isAbstract="false" isActive="false" isLeaf="false" name="wasStartedBy" visibility="public" xmi:id="LvBeWuyEwTiAAgYC" xmi:type="uml:AssociationClass">
 				<xmi:Extension extender="Visual Paradigm for UML">
 					<isRoot xmi:value="false"/>
@@ -6478,10 +6269,401 @@
 					</xmi:Extension>
 				</ownedAttribute>
 			</ownedMember>
+			<ownedMember isAbstract="false" isActive="false" isLeaf="false" name="Time" visibility="public" xmi:id="n0UGjuyCiu1SNwmv" xmi:type="uml:PrimitiveType">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<isRoot xmi:value="false"/>
+					<modelType value="Class"/>
+					<businessModel xmi:value="false"/>
+					<qualityScore value="97"/>
+					<qualityReason value="2&#9;2"/>
+					<appliedStereotype xmi:value="Class_primitive_id"/>
+				</xmi:Extension>
+			</ownedMember>
+			<ownedMember isAbstract="false" isActive="false" isLeaf="false" name="Entity" visibility="public" xmi:id="m6xjmuyEwTiAAgLk" xmi:type="uml:Class">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<isRoot xmi:value="false"/>
+					<modelType value="Class"/>
+					<businessModel xmi:value="false"/>
+					<qualityScore value="97"/>
+					<qualityReason value="2&#9;2"/>
+				</xmi:Extension>
+				<ownedAttribute aggregation="none" isDerived="false" name="id" ownerScope="instance" xmi:id="SlsYWuyEwTiAAgOj" xmi:type="uml:Property">
+					<xmi:Extension extender="Visual Paradigm for UML">
+						<attribute/>
+						<isVisble xmi:value="true"/>
+						<qualityScore value="97"/>
+						<qualityReason value="2&#9;2"/>
+					</xmi:Extension>
+				</ownedAttribute>
+				<ownedAttribute aggregation="none" isDerived="false" name="attributes" ownerScope="instance" xmi:id="z1RYWuyEwTiAAgOn" xmi:type="uml:Property">
+					<xmi:Extension extender="Visual Paradigm for UML">
+						<attribute/>
+						<isVisble xmi:value="true"/>
+						<qualityScore value="97"/>
+						<qualityReason value="2&#9;2"/>
+					</xmi:Extension>
+				</ownedAttribute>
+				<ownedAttribute aggregation="none" association="_i1UWuyEwTiAAgSK" isDerived="false" name="" type="vTljmuyEwTiAAgLp" xmi:id="f1p0WuyEwTiAAgTF" xmi:type="uml:Property">
+					<xmi:Extension extender="Visual Paradigm for UML">
+						<associationEnd/>
+						<qualifier name="" xmi:id="f1p0WuyEwTiAAgTG" xmi:type="qualifier">
+							<xmi:Extension extender="Visual Paradigm for UML">
+								<qualityScore value="-1"/>
+							</xmi:Extension>
+						</qualifier>
+						<qualityScore value="95"/>
+						<qualityReason value="1&#9;1"/>
+					</xmi:Extension>
+				</ownedAttribute>
+				<ownedAttribute aggregation="none" association="9un1WuyEwTiAAgcK" isDerived="false" isNavigable="true" type="vTljmuyEwTiAAgLp" xmi:id="WzlMWuyEwTiAAgT7" xmi:type="uml:Property">
+					<xmi:Extension extender="Visual Paradigm for UML">
+						<associationEnd/>
+						<qualifier name="" xmi:id="WzlMWuyEwTiAAgT8" xmi:type="qualifier">
+							<xmi:Extension extender="Visual Paradigm for UML">
+								<qualityScore value="100"/>
+							</xmi:Extension>
+						</qualifier>
+						<qualityScore value="95"/>
+						<qualityReason value="1&#9;1"/>
+					</xmi:Extension>
+				</ownedAttribute>
+				<ownedAttribute aggregation="none" association="q8f1WuyEwTiAAgcQ" isDerived="false" isNavigable="true" type="vTljmuyEwTiAAgLp" xmi:id="JsssWuyEwTiAAgU8" xmi:type="uml:Property">
+					<xmi:Extension extender="Visual Paradigm for UML">
+						<associationEnd/>
+						<qualifier name="" xmi:id="JsssWuyEwTiAAgU9" xmi:type="qualifier">
+							<xmi:Extension extender="Visual Paradigm for UML">
+								<qualityScore value="-1"/>
+							</xmi:Extension>
+						</qualifier>
+						<qualityScore value="95"/>
+						<qualityReason value="1&#9;1"/>
+					</xmi:Extension>
+				</ownedAttribute>
+				<ownedAttribute aggregation="none" association="tkL1WuyEwTiAAgcE" isDerived="false" type="vTljmuyEwTiAAgLp" xmi:id="oXsuWuyEwTiAAgWr" xmi:type="uml:Property">
+					<xmi:Extension extender="Visual Paradigm for UML">
+						<associationEnd/>
+						<qualifier name="" xmi:id="oXsuWuyEwTiAAgWs" xmi:type="qualifier">
+							<xmi:Extension extender="Visual Paradigm for UML">
+								<qualityScore value="-1"/>
+							</xmi:Extension>
+						</qualifier>
+						<qualityScore value="95"/>
+						<qualityReason value="1&#9;1"/>
+					</xmi:Extension>
+				</ownedAttribute>
+				<ownedAttribute aggregation="none" association="LvBeWuyEwTiAAgYC" isDerived="false" name="" type="vTljmuyEwTiAAgLp" xmi:id="wuw.WuyEwTiAAgYZ" xmi:type="uml:Property">
+					<xmi:Extension extender="Visual Paradigm for UML">
+						<associationEnd/>
+						<qualifier name="" xmi:id="wuw.WuyEwTiAAgYa" xmi:type="qualifier">
+							<xmi:Extension extender="Visual Paradigm for UML">
+								<qualityScore value="-1"/>
+							</xmi:Extension>
+						</qualifier>
+						<qualityScore value="95"/>
+						<qualityReason value="1&#9;1"/>
+					</xmi:Extension>
+				</ownedAttribute>
+				<ownedAttribute aggregation="none" association="7_3LWuyEwTiAAggX" isDerived="false" type="m6xjmuyEwTiAAgLk" xmi:id="LrnLWuyEwTiAAggR" xmi:type="uml:Property">
+					<xmi:Extension extender="Visual Paradigm for UML">
+						<associationEnd/>
+						<qualifier name="" xmi:id="LrnLWuyEwTiAAggS" xmi:type="qualifier">
+							<xmi:Extension extender="Visual Paradigm for UML">
+								<qualityScore value="-1"/>
+							</xmi:Extension>
+						</qualifier>
+						<qualityScore value="95"/>
+						<qualityReason value="1&#9;1"/>
+					</xmi:Extension>
+				</ownedAttribute>
+				<ownedAttribute aggregation="none" association="7_3LWuyEwTiAAggX" isDerived="false" isNavigable="true" type="m6xjmuyEwTiAAgLk" xmi:id="LrnLWuyEwTiAAggP" xmi:type="uml:Property">
+					<xmi:Extension extender="Visual Paradigm for UML">
+						<associationEnd/>
+						<qualifier name="" xmi:id="LrnLWuyEwTiAAggQ" xmi:type="qualifier">
+							<xmi:Extension extender="Visual Paradigm for UML">
+								<qualityScore value="-1"/>
+							</xmi:Extension>
+						</qualifier>
+						<qualityScore value="95"/>
+						<qualityReason value="1&#9;1"/>
+					</xmi:Extension>
+				</ownedAttribute>
+				<ownedAttribute aggregation="none" association="iwsbWuyEwTiAAgiT" isDerived="false" type="m6xjmuyEwTiAAgLk" xmi:id="H7xbWuyEwTiAAgi3" xmi:type="uml:Property">
+					<xmi:Extension extender="Visual Paradigm for UML">
+						<associationEnd/>
+						<qualifier name="" xmi:id="H7xbWuyEwTiAAgi4" xmi:type="qualifier">
+							<xmi:Extension extender="Visual Paradigm for UML">
+								<qualityScore value="-1"/>
+							</xmi:Extension>
+						</qualifier>
+						<qualityScore value="-1"/>
+					</xmi:Extension>
+				</ownedAttribute>
+				<ownedAttribute aggregation="none" association="iwsbWuyEwTiAAgiT" isDerived="false" isNavigable="true" type="m6xjmuyEwTiAAgLk" xmi:id="77xbWuyEwTiAAgi1" xmi:type="uml:Property">
+					<xmi:Extension extender="Visual Paradigm for UML">
+						<associationEnd/>
+						<qualifier name="" xmi:id="77xbWuyEwTiAAgi2" xmi:type="qualifier">
+							<xmi:Extension extender="Visual Paradigm for UML">
+								<qualityScore value="-1"/>
+							</xmi:Extension>
+						</qualifier>
+						<qualityScore value="-1"/>
+					</xmi:Extension>
+				</ownedAttribute>
+				<ownedAttribute aggregation="none" association="ZKXU.uyCiu1SNwZb" isDerived="false" type="m6xjmuyEwTiAAgLk" xmi:id="gi8U.uyCiu1SNwYp" xmi:type="uml:Property">
+					<xmi:Extension extender="Visual Paradigm for UML">
+						<associationEnd/>
+						<qualifier name="" xmi:id="gi8U.uyCiu1SNwYq" xmi:type="qualifier">
+							<xmi:Extension extender="Visual Paradigm for UML">
+								<qualityScore value="-1"/>
+							</xmi:Extension>
+						</qualifier>
+						<qualityScore value="95"/>
+						<qualityReason value="1&#9;1"/>
+					</xmi:Extension>
+				</ownedAttribute>
+				<ownedAttribute aggregation="none" association="ZKXU.uyCiu1SNwZb" isDerived="false" isNavigable="true" type="m6xjmuyEwTiAAgLk" xmi:id="gi8U.uyCiu1SNwYn" xmi:type="uml:Property">
+					<xmi:Extension extender="Visual Paradigm for UML">
+						<associationEnd/>
+						<qualifier name="" xmi:id="gi8U.uyCiu1SNwYo" xmi:type="qualifier">
+							<xmi:Extension extender="Visual Paradigm for UML">
+								<qualityScore value="-1"/>
+							</xmi:Extension>
+						</qualifier>
+						<qualityScore value="95"/>
+						<qualityReason value="1&#9;1"/>
+					</xmi:Extension>
+				</ownedAttribute>
+				<ownedAttribute aggregation="none" association="W8Q0.uyCiu1SNwZl" isDerived="false" name="" type="m6xjmuyEwTiAAgLk" xmi:id="D2RU.uyCiu1SNwZD" xmi:type="uml:Property">
+					<xmi:Extension extender="Visual Paradigm for UML">
+						<associationEnd/>
+						<qualifier name="" xmi:id="D2RU.uyCiu1SNwZE" xmi:type="qualifier">
+							<xmi:Extension extender="Visual Paradigm for UML">
+								<qualityScore value="-1"/>
+							</xmi:Extension>
+						</qualifier>
+						<qualityScore value="-1"/>
+					</xmi:Extension>
+				</ownedAttribute>
+				<ownedAttribute aggregation="none" association="W8Q0.uyCiu1SNwZl" isDerived="false" isNavigable="true" type="m6xjmuyEwTiAAgLk" xmi:id="D2RU.uyCiu1SNwZB" xmi:type="uml:Property">
+					<xmi:Extension extender="Visual Paradigm for UML">
+						<associationEnd/>
+						<qualifier name="" xmi:id="D2RU.uyCiu1SNwZC" xmi:type="qualifier">
+							<xmi:Extension extender="Visual Paradigm for UML">
+								<qualityScore value="-1"/>
+							</xmi:Extension>
+						</qualifier>
+						<qualityScore value="-1"/>
+					</xmi:Extension>
+				</ownedAttribute>
+				<ownedAttribute aggregation="none" association="C9LxzuyCiu1SNw0z" isDerived="false" isNavigable="true" type="2VbNBuyCiu1SNwe6" xmi:id="6.htBuyCiu1SNwgO" xmi:type="uml:Property">
+					<xmi:Extension extender="Visual Paradigm for UML">
+						<associationEnd/>
+						<qualifier name="" xmi:id="6.htBuyCiu1SNwgP" xmi:type="qualifier">
+							<xmi:Extension extender="Visual Paradigm for UML">
+								<qualityScore value="-1"/>
+							</xmi:Extension>
+						</qualifier>
+						<qualityScore value="-1"/>
+					</xmi:Extension>
+				</ownedAttribute>
+				<ownedAttribute aggregation="none" association="o.cRLuyCiu1SNw4W" isDerived="false" isNavigable="true" type="XlvhLuyCiu1SNw38" xmi:id="FwURLuyCiu1SNw4M" xmi:type="uml:Property">
+					<xmi:Extension extender="Visual Paradigm for UML">
+						<associationEnd/>
+						<qualifier name="" xmi:id="FwURLuyCiu1SNw4N" xmi:type="qualifier">
+							<xmi:Extension extender="Visual Paradigm for UML">
+								<qualityScore value="-1"/>
+							</xmi:Extension>
+						</qualifier>
+						<qualityScore value="95"/>
+						<qualityReason value="1&#9;1"/>
+					</xmi:Extension>
+				</ownedAttribute>
+				<ownedAttribute aggregation="none" association="Ftn8nuyCiu1SNxQP" isDerived="false" type="m6xjmuyEwTiAAgLk" xmi:id="VKq8nuyCiu1SNxPo" xmi:type="uml:Property">
+					<xmi:Extension extender="Visual Paradigm for UML">
+						<associationEnd/>
+						<qualifier name="" xmi:id="VKq8nuyCiu1SNxPp" xmi:type="qualifier">
+							<xmi:Extension extender="Visual Paradigm for UML">
+								<qualityScore value="-1"/>
+							</xmi:Extension>
+						</qualifier>
+						<qualityScore value="95"/>
+						<qualityReason value="1&#9;1"/>
+					</xmi:Extension>
+				</ownedAttribute>
+				<ownedAttribute aggregation="none" association="Ftn8nuyCiu1SNxQP" isDerived="false" isNavigable="true" type="m6xjmuyEwTiAAgLk" xmi:id="pKq8nuyCiu1SNxPm" xmi:type="uml:Property">
+					<xmi:Extension extender="Visual Paradigm for UML">
+						<associationEnd/>
+						<qualifier name="" xmi:id="VKq8nuyCiu1SNxPn" xmi:type="qualifier">
+							<xmi:Extension extender="Visual Paradigm for UML">
+								<qualityScore value="-1"/>
+							</xmi:Extension>
+						</qualifier>
+						<qualityScore value="95"/>
+						<qualityReason value="1&#9;1"/>
+					</xmi:Extension>
+				</ownedAttribute>
+			</ownedMember>
+			<ownedMember isAbstract="false" isActive="false" isLeaf="false" name="Activity" visibility="public" xmi:id="vTljmuyEwTiAAgLp" xmi:type="uml:Class">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<isRoot xmi:value="false"/>
+					<modelType value="Class"/>
+					<businessModel xmi:value="false"/>
+					<qualityScore value="97"/>
+					<qualityReason value="2&#9;2"/>
+				</xmi:Extension>
+				<ownedAttribute aggregation="none" isDerived="false" name="id" ownerScope="instance" xmi:id="G3u4WuyEwTiAAgPd" xmi:type="uml:Property">
+					<xmi:Extension extender="Visual Paradigm for UML">
+						<attribute/>
+						<isVisble xmi:value="true"/>
+						<qualityScore value="97"/>
+						<qualityReason value="2&#9;2"/>
+					</xmi:Extension>
+					<lowerValue value="1" xmi:id="G3u4WuyEwTiAAgPd_multiplicity_lowerValue" xmi:type="uml:LiteralString"/>
+				</ownedAttribute>
+				<ownedAttribute aggregation="none" isDerived="false" name="startTime" ownerScope="instance" xmi:id="fa44WuyEwTiAAgPN" xmi:type="uml:Property">
+					<xmi:Extension extender="Visual Paradigm for UML">
+						<attribute/>
+						<isVisble xmi:value="true"/>
+						<qualityScore value="97"/>
+						<qualityReason value="2&#9;2"/>
+					</xmi:Extension>
+					<lowerValue value="0" xmi:id="fa44WuyEwTiAAgPN_multiplicity_lowerValue" xmi:type="uml:LiteralString"/>
+					<upperValue value="1" xmi:id="fa44WuyEwTiAAgPN_multiplicity_upperValue" xmi:type="uml:LiteralString"/>
+				</ownedAttribute>
+				<ownedAttribute aggregation="none" isDerived="false" name="endTime" ownerScope="instance" xmi:id="mJi4WuyEwTiAAgPP" xmi:type="uml:Property">
+					<xmi:Extension extender="Visual Paradigm for UML">
+						<attribute/>
+						<isVisble xmi:value="true"/>
+						<qualityScore value="97"/>
+						<qualityReason value="2&#9;2"/>
+					</xmi:Extension>
+					<lowerValue value="0" xmi:id="mJi4WuyEwTiAAgPP_multiplicity_lowerValue" xmi:type="uml:LiteralString"/>
+					<upperValue value="1" xmi:id="mJi4WuyEwTiAAgPP_multiplicity_upperValue" xmi:type="uml:LiteralString"/>
+				</ownedAttribute>
+				<ownedAttribute aggregation="none" isDerived="false" name="attributes" ownerScope="instance" xmi:id="Wz64WuyEwTiAAgPY" xmi:type="uml:Property">
+					<xmi:Extension extender="Visual Paradigm for UML">
+						<attribute/>
+						<isVisble xmi:value="true"/>
+						<qualityScore value="97"/>
+						<qualityReason value="2&#9;2"/>
+					</xmi:Extension>
+				</ownedAttribute>
+				<ownedAttribute aggregation="none" association="_i1UWuyEwTiAAgSK" isDerived="false" isNavigable="true" name="trigger" type="m6xjmuyEwTiAAgLk" xmi:id="_1p0WuyEwTiAAgTH" xmi:type="uml:Property">
+					<xmi:Extension extender="Visual Paradigm for UML">
+						<associationEnd/>
+						<qualifier name="" xmi:id="_1p0WuyEwTiAAgTI" xmi:type="qualifier">
+							<xmi:Extension extender="Visual Paradigm for UML">
+								<qualityScore value="-1"/>
+							</xmi:Extension>
+						</qualifier>
+						<qualityScore value="92"/>
+						<qualityReason value="1&#9;1&#10;2&#9;2"/>
+					</xmi:Extension>
+				</ownedAttribute>
+				<ownedAttribute aggregation="none" association="9un1WuyEwTiAAgcK" isDerived="false" type="m6xjmuyEwTiAAgLk" xmi:id="WzlMWuyEwTiAAgT9" xmi:type="uml:Property">
+					<xmi:Extension extender="Visual Paradigm for UML">
+						<associationEnd/>
+						<qualifier name="" xmi:id="WzlMWuyEwTiAAgT." xmi:type="qualifier">
+							<xmi:Extension extender="Visual Paradigm for UML">
+								<qualityScore value="100"/>
+							</xmi:Extension>
+						</qualifier>
+						<qualityScore value="95"/>
+						<qualityReason value="1&#9;1"/>
+					</xmi:Extension>
+				</ownedAttribute>
+				<ownedAttribute aggregation="none" association="q8f1WuyEwTiAAgcQ" isDerived="false" type="m6xjmuyEwTiAAgLk" xmi:id="JsssWuyEwTiAAgU6" xmi:type="uml:Property">
+					<xmi:Extension extender="Visual Paradigm for UML">
+						<associationEnd/>
+						<qualifier name="" xmi:id="JsssWuyEwTiAAgU7" xmi:type="qualifier">
+							<xmi:Extension extender="Visual Paradigm for UML">
+								<qualityScore value="-1"/>
+							</xmi:Extension>
+						</qualifier>
+						<qualityScore value="-1"/>
+					</xmi:Extension>
+				</ownedAttribute>
+				<ownedAttribute aggregation="none" association="tkL1WuyEwTiAAgcE" isDerived="false" isNavigable="true" type="m6xjmuyEwTiAAgLk" xmi:id="oXsuWuyEwTiAAgWt" xmi:type="uml:Property">
+					<xmi:Extension extender="Visual Paradigm for UML">
+						<associationEnd/>
+						<qualifier name="" xmi:id="oXsuWuyEwTiAAgWu" xmi:type="qualifier">
+							<xmi:Extension extender="Visual Paradigm for UML">
+								<qualityScore value="-1"/>
+							</xmi:Extension>
+						</qualifier>
+						<qualityScore value="-1"/>
+					</xmi:Extension>
+				</ownedAttribute>
+				<ownedAttribute aggregation="none" association="LvBeWuyEwTiAAgYC" isDerived="false" isNavigable="true" name="trigger" type="m6xjmuyEwTiAAgLk" xmi:id="wuw.WuyEwTiAAgYb" xmi:type="uml:Property">
+					<xmi:Extension extender="Visual Paradigm for UML">
+						<associationEnd/>
+						<qualifier name="" xmi:id="wuw.WuyEwTiAAgYc" xmi:type="qualifier">
+							<xmi:Extension extender="Visual Paradigm for UML">
+								<qualityScore value="-1"/>
+							</xmi:Extension>
+						</qualifier>
+						<qualityScore value="92"/>
+						<qualityReason value="1&#9;1&#10;2&#9;2"/>
+					</xmi:Extension>
+				</ownedAttribute>
+				<ownedAttribute aggregation="none" association="cSnjeuyCiu1SNwVU" isDerived="false" isNavigable="true" type="vTljmuyEwTiAAgLp" xmi:id="g1DjeuyCiu1SNwVE" xmi:type="uml:Property">
+					<xmi:Extension extender="Visual Paradigm for UML">
+						<associationEnd/>
+						<qualifier name="" xmi:id="g1DjeuyCiu1SNwVF" xmi:type="qualifier">
+							<xmi:Extension extender="Visual Paradigm for UML">
+								<qualityScore value="-1"/>
+							</xmi:Extension>
+						</qualifier>
+						<qualityScore value="-1"/>
+					</xmi:Extension>
+				</ownedAttribute>
+				<ownedAttribute aggregation="none" association="cSnjeuyCiu1SNwVU" isDerived="false" type="vTljmuyEwTiAAgLp" xmi:id="g1DjeuyCiu1SNwVC" xmi:type="uml:Property">
+					<xmi:Extension extender="Visual Paradigm for UML">
+						<associationEnd/>
+						<qualifier name="" xmi:id="g1DjeuyCiu1SNwVD" xmi:type="qualifier">
+							<xmi:Extension extender="Visual Paradigm for UML">
+								<qualityScore value="-1"/>
+							</xmi:Extension>
+						</qualifier>
+						<qualityScore value="-1"/>
+					</xmi:Extension>
+				</ownedAttribute>
+				<ownedAttribute aggregation="none" association="WdORzuyCiu1SNwzI" isDerived="false" isNavigable="true" type="2VbNBuyCiu1SNwe6" xmi:id="Uf5tBuyCiu1SNwgb" xmi:type="uml:Property">
+					<xmi:Extension extender="Visual Paradigm for UML">
+						<associationEnd/>
+						<qualifier name="" xmi:id="Uf5tBuyCiu1SNwgc" xmi:type="qualifier">
+							<xmi:Extension extender="Visual Paradigm for UML">
+								<qualityScore value="-1"/>
+							</xmi:Extension>
+						</qualifier>
+						<qualityScore value="-1"/>
+					</xmi:Extension>
+				</ownedAttribute>
+			</ownedMember>
+			<ownedComment body="Classes and associations&#10;within this area belong to PROV core" name="" xmi:id="afB2HuyCiu1SNxHe" xmi:type="uml:Comment">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<htmlValue value="&lt;head&gt;&#10;    &lt;style type=&quot;text/css&quot;&gt;&#10;      &lt;!--&#10;        body { color: #000000; font-family: Dialog; font-size: 11px }&#10;      --&gt;&#10;    &lt;/style&gt;&#10;    &#10;  &lt;/head&gt;&#10;  &lt;body&gt;&#10;    &lt;p&gt;&#10;      Classes and associations&#10;    &lt;/p&gt;&#10;    &lt;p&gt;&#10;      within this area belong to PROV core&#10;    &lt;/p&gt;&#10;  &lt;/body&gt;"/>
+					<type value="NOTE"/>
+					<qualityScore value="100"/>
+				</xmi:Extension>
+			</ownedComment>
 		</ownedMember>
 		<ownedMember isAbstract="false" isLeaf="false" name="Component3" visibility="public" xmi:id="WzQLWuyEwTiAAgey" xmi:type="uml:Package">
 			<xmi:Extension extender="Visual Paradigm for UML">
 				<isRoot xmi:value="false"/>
+				<vpumlChildModels>
+					<vpumlModel id="yr2uHuyCiu1SNxJW" modelType="ShapeEditorShape">
+						<properties>
+							<property name="name" type="string" value=""/>
+							<property name="modelType" type="string" value="ShapeEditorShape"/>
+							<property htmlValue="" name="documentation" type="htmlString" value=""/>
+							<property name="pmAuthor" type="string" value="lavm"/>
+							<property name="pmCreateDateTime" type="string" value="1337755811155"/>
+							<property name="pmLastModified" type="string" value="1337756066660"/>
+							<property name="qualityScore" type="int" value="100"/>
+						</properties>
+					</vpumlModel>
+				</vpumlChildModels>
 				<qualityScore value="26"/>
 				<qualityReason value="2&#9;2&#10;5&#9;5"/>
 				<subdiagram xmi:value="VRALWuyEwTiAAges"/>
@@ -6524,6 +6706,7 @@
 					<businessModel xmi:value="false"/>
 					<qualityScore value="97"/>
 					<qualityReason value="2&#9;2"/>
+					<appliedStereotype xmi:value="Class_prov:type_id"/>
 				</xmi:Extension>
 				<memberEnd xmi:idref="77xbWuyEwTiAAgi1"/>
 				<memberEnd xmi:idref="H7xbWuyEwTiAAgi3"/>
@@ -6542,6 +6725,7 @@
 					<businessModel xmi:value="false"/>
 					<qualityScore value="97"/>
 					<qualityReason value="2&#9;2"/>
+					<appliedStereotype xmi:value="Class_prov:type_id"/>
 				</xmi:Extension>
 				<memberEnd xmi:idref="gi8U.uyCiu1SNwYn"/>
 				<memberEnd xmi:idref="gi8U.uyCiu1SNwYp"/>
@@ -6560,6 +6744,7 @@
 					<businessModel xmi:value="false"/>
 					<qualityScore value="97"/>
 					<qualityReason value="2&#9;2"/>
+					<appliedStereotype xmi:value="Class_prov:type_id"/>
 				</xmi:Extension>
 				<memberEnd xmi:idref="D2RU.uyCiu1SNwZB"/>
 				<memberEnd xmi:idref="D2RU.uyCiu1SNwZD"/>
@@ -6569,6 +6754,19 @@
 					</xmi:Extension>
 				</generalization>
 			</ownedMember>
+			<ownedMember isAbstract="false" isActive="false" isLeaf="false" name="tracedTo" visibility="public" xmi:id="Ftn8nuyCiu1SNxQP" xmi:type="uml:AssociationClass">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<isRoot xmi:value="false"/>
+					<modelType value="Class"/>
+					<association isAbstract="false" isDerived="false" isLeaf="false" name="tracedTo" xmi:id="pKq8nuyCiu1SNxPl"/>
+					<associationClass from="pKq8nuyCiu1SNxPl" to="Ftn8nuyCiu1SNxQP" xmi:id="P7f8nuyCiu1SNxQU"/>
+					<businessModel xmi:value="false"/>
+					<qualityScore value="97"/>
+					<qualityReason value="2&#9;2"/>
+				</xmi:Extension>
+				<memberEnd xmi:idref="pKq8nuyCiu1SNxPm"/>
+				<memberEnd xmi:idref="VKq8nuyCiu1SNxPo"/>
+			</ownedMember>
 		</ownedMember>
 		<ownedMember isAbstract="false" isLeaf="false" name="Essentials" visibility="public" xmi:id="n4FNBuyCiu1SNwd4" xmi:type="uml:Package">
 			<xmi:Extension extender="Visual Paradigm for UML">
@@ -6581,6 +6779,19 @@
 		<ownedMember isAbstract="false" isLeaf="false" name="Component2" visibility="public" xmi:id="wzrNBuyCiu1SNwe3" xmi:type="uml:Package">
 			<xmi:Extension extender="Visual Paradigm for UML">
 				<isRoot xmi:value="false"/>
+				<vpumlChildModels>
+					<vpumlModel id="XHTOHuyCiu1SNxIe" modelType="ShapeEditorShape">
+						<properties>
+							<property name="name" type="string" value=""/>
+							<property name="modelType" type="string" value="ShapeEditorShape"/>
+							<property htmlValue="" name="documentation" type="htmlString" value=""/>
+							<property name="pmAuthor" type="string" value="lavm"/>
+							<property name="pmCreateDateTime" type="string" value="1337755643450"/>
+							<property name="pmLastModified" type="string" value="1337755777069"/>
+							<property name="qualityScore" type="int" value="100"/>
+						</properties>
+					</vpumlModel>
+				</vpumlChildModels>
 				<qualityScore value="26"/>
 				<qualityReason value="2&#9;2&#10;5&#9;5"/>
 				<subdiagram xmi:value="LDLNBuyCiu1SNwex"/>
@@ -6608,7 +6819,528 @@
 						<qualityReason value="2&#9;2"/>
 					</xmi:Extension>
 				</ownedAttribute>
+				<ownedAttribute aggregation="none" association="C9LxzuyCiu1SNw0z" isDerived="false" type="m6xjmuyEwTiAAgLk" xmi:id="6.htBuyCiu1SNwgM" xmi:type="uml:Property">
+					<xmi:Extension extender="Visual Paradigm for UML">
+						<associationEnd/>
+						<qualifier name="" xmi:id="6.htBuyCiu1SNwgN" xmi:type="qualifier">
+							<xmi:Extension extender="Visual Paradigm for UML">
+								<qualityScore value="-1"/>
+							</xmi:Extension>
+						</qualifier>
+						<qualityScore value="-1"/>
+					</xmi:Extension>
+				</ownedAttribute>
+				<ownedAttribute aggregation="none" association="WdORzuyCiu1SNwzI" isDerived="false" type="vTljmuyEwTiAAgLp" xmi:id="Uf5tBuyCiu1SNwgZ" xmi:type="uml:Property">
+					<xmi:Extension extender="Visual Paradigm for UML">
+						<associationEnd/>
+						<qualifier name="" xmi:id="Uf5tBuyCiu1SNwga" xmi:type="qualifier">
+							<xmi:Extension extender="Visual Paradigm for UML">
+								<qualityScore value="-1"/>
+							</xmi:Extension>
+						</qualifier>
+						<qualityScore value="-1"/>
+					</xmi:Extension>
+				</ownedAttribute>
+				<ownedAttribute aggregation="none" association="qmwxzuyCiu1SNwz5" isDerived="false" isNavigable="true" type="2VbNBuyCiu1SNwe6" xmi:id="eYgRzuyCiu1SNwyL" xmi:type="uml:Property">
+					<xmi:Extension extender="Visual Paradigm for UML">
+						<associationEnd/>
+						<qualifier name="" xmi:id="eYgRzuyCiu1SNwyM" xmi:type="qualifier">
+							<xmi:Extension extender="Visual Paradigm for UML">
+								<qualityScore value="-1"/>
+							</xmi:Extension>
+						</qualifier>
+						<qualityScore value="-1"/>
+					</xmi:Extension>
+				</ownedAttribute>
+				<ownedAttribute aggregation="none" association="qmwxzuyCiu1SNwz5" isDerived="false" type="2VbNBuyCiu1SNwe6" xmi:id="uYgRzuyCiu1SNwyJ" xmi:type="uml:Property">
+					<xmi:Extension extender="Visual Paradigm for UML">
+						<associationEnd/>
+						<qualifier name="" xmi:id="eYgRzuyCiu1SNwyK" xmi:type="qualifier">
+							<xmi:Extension extender="Visual Paradigm for UML">
+								<qualityScore value="-1"/>
+							</xmi:Extension>
+						</qualifier>
+						<qualityScore value="95"/>
+						<qualityReason value="1&#9;1"/>
+					</xmi:Extension>
+				</ownedAttribute>
 			</ownedMember>
+			<ownedMember isAbstract="false" isActive="false" isLeaf="false" name="wasAssociatedWith" visibility="public" xmi:id="WdORzuyCiu1SNwzI" xmi:type="uml:AssociationClass">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<isRoot xmi:value="false"/>
+					<modelType value="Class"/>
+					<association isAbstract="false" isDerived="false" isLeaf="false" name="wasAssociatedWith" xmi:id="Uf5tBuyCiu1SNwgY"/>
+					<associationClass from="Uf5tBuyCiu1SNwgY" to="WdORzuyCiu1SNwzI" xmi:id="N.hRzuyCiu1SNwzM"/>
+					<businessModel xmi:value="false"/>
+					<qualityScore value="97"/>
+					<qualityReason value="2&#9;2"/>
+				</xmi:Extension>
+				<memberEnd xmi:idref="Uf5tBuyCiu1SNwgZ"/>
+				<memberEnd xmi:idref="Uf5tBuyCiu1SNwgb"/>
+				<ownedAttribute aggregation="none" isDerived="false" name="id" ownerScope="instance" xmi:id="McVxzuyCiu1SNw0p" xmi:type="uml:Property">
+					<xmi:Extension extender="Visual Paradigm for UML">
+						<attribute/>
+						<isVisble xmi:value="true"/>
+						<qualityScore value="97"/>
+						<qualityReason value="2&#9;2"/>
+					</xmi:Extension>
+				</ownedAttribute>
+				<ownedAttribute aggregation="none" isDerived="false" name="attributes" ownerScope="instance" xmi:id="qGtxzuyCiu1SNw0r" xmi:type="uml:Property">
+					<xmi:Extension extender="Visual Paradigm for UML">
+						<attribute/>
+						<isVisble xmi:value="true"/>
+						<qualityScore value="97"/>
+						<qualityReason value="2&#9;2"/>
+					</xmi:Extension>
+				</ownedAttribute>
+			</ownedMember>
+			<ownedMember isAbstract="false" isActive="false" isLeaf="false" name="Plan" visibility="public" xmi:id="CIdRzuyCiu1SNwzZ" xmi:type="uml:Class">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<isRoot xmi:value="false"/>
+					<modelType value="Class"/>
+					<businessModel xmi:value="false"/>
+					<qualityScore value="97"/>
+					<qualityReason value="2&#9;2"/>
+					<appliedStereotype xmi:value="Class_prov:type_id"/>
+				</xmi:Extension>
+				<generalization general="m6xjmuyEwTiAAgLk" xmi:id="cELRzuyCiu1SNwzd" xmi:type="uml:Generalization">
+					<xmi:Extension extender="Visual Paradigm for UML">
+						<qualityScore value="100"/>
+					</xmi:Extension>
+				</generalization>
+			</ownedMember>
+			<ownedMember isAbstract="false" isActive="false" isLeaf="false" name="actedOnBehalfOf" visibility="public" xmi:id="qmwxzuyCiu1SNwz5" xmi:type="uml:AssociationClass">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<isRoot xmi:value="false"/>
+					<modelType value="Class"/>
+					<association isAbstract="false" isDerived="false" isLeaf="false" name="actedOnBehalfOf" xmi:id="uYgRzuyCiu1SNwyI"/>
+					<associationClass from="uYgRzuyCiu1SNwyI" to="qmwxzuyCiu1SNwz5" xmi:id="1DMxzuyCiu1SNw0F"/>
+					<businessModel xmi:value="false"/>
+					<qualityScore value="97"/>
+					<qualityReason value="2&#9;2"/>
+				</xmi:Extension>
+				<memberEnd xmi:idref="uYgRzuyCiu1SNwyJ"/>
+				<memberEnd xmi:idref="eYgRzuyCiu1SNwyL"/>
+				<ownedAttribute aggregation="none" isDerived="false" name="id" ownerScope="instance" xmi:id="64exzuyCiu1SNw0e" xmi:type="uml:Property">
+					<xmi:Extension extender="Visual Paradigm for UML">
+						<attribute/>
+						<isVisble xmi:value="true"/>
+						<qualityScore value="97"/>
+						<qualityReason value="2&#9;2"/>
+					</xmi:Extension>
+					<lowerValue value="0" xmi:id="64exzuyCiu1SNw0e_multiplicity_lowerValue" xmi:type="uml:LiteralString"/>
+					<upperValue value="1" xmi:id="64exzuyCiu1SNw0e_multiplicity_upperValue" xmi:type="uml:LiteralString"/>
+				</ownedAttribute>
+				<ownedAttribute aggregation="none" isDerived="false" name="attributes" ownerScope="instance" xmi:id="WCpxzuyCiu1SNw0h" xmi:type="uml:Property">
+					<xmi:Extension extender="Visual Paradigm for UML">
+						<attribute/>
+						<isVisble xmi:value="true"/>
+						<qualityScore value="97"/>
+						<qualityReason value="2&#9;2"/>
+					</xmi:Extension>
+				</ownedAttribute>
+			</ownedMember>
+			<ownedMember isAbstract="false" isActive="false" isLeaf="false" name="wasAttributedTo" visibility="public" xmi:id="C9LxzuyCiu1SNw0z" xmi:type="uml:AssociationClass">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<isRoot xmi:value="false"/>
+					<modelType value="Class"/>
+					<association isAbstract="false" isDerived="false" isLeaf="false" name="wasAttributedTo" xmi:id="6.htBuyCiu1SNwgL"/>
+					<associationClass from="6.htBuyCiu1SNwgL" to="C9LxzuyCiu1SNw0z" xmi:id="FMPxzuyCiu1SNw08"/>
+					<businessModel xmi:value="false"/>
+					<qualityScore value="97"/>
+					<qualityReason value="2&#9;2"/>
+				</xmi:Extension>
+				<memberEnd xmi:idref="6.htBuyCiu1SNwgM"/>
+				<memberEnd xmi:idref="6.htBuyCiu1SNwgO"/>
+				<ownedAttribute aggregation="none" isDerived="false" name="id" ownerScope="instance" xmi:id="pVfxzuyCiu1SNw1D" xmi:type="uml:Property">
+					<xmi:Extension extender="Visual Paradigm for UML">
+						<attribute/>
+						<isVisble xmi:value="true"/>
+						<qualityScore value="97"/>
+						<qualityReason value="2&#9;2"/>
+					</xmi:Extension>
+				</ownedAttribute>
+				<ownedAttribute aggregation="none" isDerived="false" name="attributes" ownerScope="instance" xmi:id="4AgJzuyCiu1SNw1F" xmi:type="uml:Property">
+					<xmi:Extension extender="Visual Paradigm for UML">
+						<attribute/>
+						<isVisble xmi:value="true"/>
+						<qualityScore value="97"/>
+						<qualityReason value="2&#9;2"/>
+					</xmi:Extension>
+				</ownedAttribute>
+			</ownedMember>
+			<ownedMember isAbstract="false" isActive="false" isLeaf="false" name="SoftwareAgent" visibility="public" xmi:id="4V6W3uyCiu1SNxTH" xmi:type="uml:Class">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<isRoot xmi:value="false"/>
+					<modelType value="Class"/>
+					<businessModel xmi:value="false"/>
+					<qualityScore value="-2"/>
+					<appliedStereotype xmi:value="Class_prov:type_id"/>
+				</xmi:Extension>
+				<generalization general="2VbNBuyCiu1SNwe6" xmi:id="tJTW3uyCiu1SNxT." xmi:type="uml:Generalization">
+					<xmi:Extension extender="Visual Paradigm for UML">
+						<qualityScore value="100"/>
+					</xmi:Extension>
+				</generalization>
+			</ownedMember>
+			<ownedMember isAbstract="false" isActive="false" isLeaf="false" name="Person" visibility="public" xmi:id="RB2W3uyCiu1SNxTP" xmi:type="uml:Class">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<isRoot xmi:value="false"/>
+					<modelType value="Class"/>
+					<businessModel xmi:value="false"/>
+					<qualityScore value="-2"/>
+					<appliedStereotype xmi:value="Class_prov:type_id"/>
+				</xmi:Extension>
+				<generalization general="2VbNBuyCiu1SNwe6" xmi:id="BHNW3uyCiu1SNxT2" xmi:type="uml:Generalization">
+					<xmi:Extension extender="Visual Paradigm for UML">
+						<qualityScore value="100"/>
+					</xmi:Extension>
+				</generalization>
+			</ownedMember>
+			<ownedMember isAbstract="false" isActive="false" isLeaf="false" name="Organization" visibility="public" xmi:id="zuuW3uyCiu1SNxTU" xmi:type="uml:Class">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<isRoot xmi:value="false"/>
+					<modelType value="Class"/>
+					<businessModel xmi:value="false"/>
+					<qualityScore value="-2"/>
+					<appliedStereotype xmi:value="Class_prov:type_id"/>
+				</xmi:Extension>
+				<generalization general="2VbNBuyCiu1SNwe6" xmi:id="oCw23uyCiu1SNxUT" xmi:type="uml:Generalization">
+					<xmi:Extension extender="Visual Paradigm for UML">
+						<qualityScore value="100"/>
+					</xmi:Extension>
+				</generalization>
+			</ownedMember>
+		</ownedMember>
+		<ownedMember name="primitive" xmi:id="Class_primitive_id" xmi:type="uml:Stereotype">
+			<xmi:Extension extender="Visual Paradigm for UML">
+				<baseType value="Class"/>
+				<qualityScore value="-1"/>
+			</xmi:Extension>
+		</ownedMember>
+		<ownedMember name="Entity Bean" xmi:id="Class_Entity Bean_id" xmi:type="uml:Stereotype">
+			<xmi:Extension extender="Visual Paradigm for UML">
+				<baseType value="Class"/>
+				<qualityScore value="-1"/>
+			</xmi:Extension>
+		</ownedMember>
+		<ownedMember isAbstract="false" isLeaf="false" name="Component4" visibility="public" xmi:id="MdIpzuyCiu1SNw10" xmi:type="uml:Package">
+			<xmi:Extension extender="Visual Paradigm for UML">
+				<isRoot xmi:value="false"/>
+				<qualityScore value="26"/>
+				<qualityReason value="2&#9;2&#10;5&#9;5"/>
+				<subdiagram xmi:value="LWwpzuyCiu1SNw1u"/>
+			</xmi:Extension>
+		</ownedMember>
+		<ownedMember isAbstract="false" isLeaf="false" name="Component5" visibility="public" xmi:id="xgHhLuyCiu1SNw3Y" xmi:type="uml:Package">
+			<xmi:Extension extender="Visual Paradigm for UML">
+				<isRoot xmi:value="false"/>
+				<qualityScore value="26"/>
+				<qualityReason value="2&#9;2&#10;5&#9;5"/>
+				<subdiagram xmi:value="cTrhLuyCiu1SNw3S"/>
+			</xmi:Extension>
+			<ownedMember isAbstract="false" isActive="false" isLeaf="false" name="Bundle" visibility="public" xmi:id="XlvhLuyCiu1SNw38" xmi:type="uml:Class">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<isRoot xmi:value="false"/>
+					<modelType value="Class"/>
+					<businessModel xmi:value="false"/>
+					<qualityScore value="97"/>
+					<qualityReason value="2&#9;2"/>
+					<appliedStereotype xmi:value="Class_prov:type_id"/>
+				</xmi:Extension>
+				<generalization general="m6xjmuyEwTiAAgLk" xmi:id="gt_hLuyCiu1SNw4A" xmi:type="uml:Generalization">
+					<xmi:Extension extender="Visual Paradigm for UML">
+						<qualityScore value="100"/>
+					</xmi:Extension>
+				</generalization>
+				<ownedAttribute aggregation="none" association="o.cRLuyCiu1SNw4W" isDerived="false" type="m6xjmuyEwTiAAgLk" xmi:id="FwURLuyCiu1SNw4K" xmi:type="uml:Property">
+					<xmi:Extension extender="Visual Paradigm for UML">
+						<associationEnd/>
+						<qualifier name="" xmi:id="FwURLuyCiu1SNw4L" xmi:type="qualifier">
+							<xmi:Extension extender="Visual Paradigm for UML">
+								<qualityScore value="-1"/>
+							</xmi:Extension>
+						</qualifier>
+						<qualityScore value="95"/>
+						<qualityReason value="1&#9;1"/>
+					</xmi:Extension>
+				</ownedAttribute>
+			</ownedMember>
+			<ownedMember isAbstract="false" isActive="false" isLeaf="false" name="hasProvenanceIn" visibility="public" xmi:id="o.cRLuyCiu1SNw4W" xmi:type="uml:AssociationClass">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<isRoot xmi:value="false"/>
+					<modelType value="Class"/>
+					<association isAbstract="false" isDerived="false" isLeaf="false" name="hasProvenanceIn" xmi:id="FwURLuyCiu1SNw4J"/>
+					<associationClass from="FwURLuyCiu1SNw4J" to="o.cRLuyCiu1SNw4W" xmi:id="eyqRLuyCiu1SNw4b"/>
+					<businessModel xmi:value="false"/>
+					<qualityScore value="97"/>
+					<qualityReason value="2&#9;2"/>
+				</xmi:Extension>
+				<memberEnd xmi:idref="FwURLuyCiu1SNw4K"/>
+				<memberEnd xmi:idref="FwURLuyCiu1SNw4M"/>
+				<ownedAttribute aggregation="none" isDerived="false" name="id" ownerScope="instance" xmi:id="JVXRLuyCiu1SNw5K" xmi:type="uml:Property">
+					<xmi:Extension extender="Visual Paradigm for UML">
+						<attribute/>
+						<isVisble xmi:value="true"/>
+						<qualityScore value="97"/>
+						<qualityReason value="2&#9;2"/>
+					</xmi:Extension>
+				</ownedAttribute>
+				<ownedAttribute aggregation="none" isDerived="false" name="provenance-uri" ownerScope="instance" xmi:id="hWtRLuyCiu1SNw5G" xmi:type="uml:Property">
+					<xmi:Extension extender="Visual Paradigm for UML">
+						<attribute/>
+						<isVisble xmi:value="true"/>
+						<qualityScore value="97"/>
+						<qualityReason value="2&#9;2"/>
+					</xmi:Extension>
+				</ownedAttribute>
+				<ownedAttribute aggregation="none" isDerived="false" name="service-uri" ownerScope="instance" xmi:id="acDRLuyCiu1SNw5I" xmi:type="uml:Property">
+					<xmi:Extension extender="Visual Paradigm for UML">
+						<attribute/>
+						<isVisble xmi:value="true"/>
+						<qualityScore value="97"/>
+						<qualityReason value="2&#9;2"/>
+					</xmi:Extension>
+				</ownedAttribute>
+				<ownedAttribute aggregation="none" isDerived="false" name="attributes" ownerScope="instance" xmi:id="RuvRLuyCiu1SNw5M" xmi:type="uml:Property">
+					<xmi:Extension extender="Visual Paradigm for UML">
+						<attribute/>
+						<isVisble xmi:value="true"/>
+						<qualityScore value="97"/>
+						<qualityReason value="2&#9;2"/>
+					</xmi:Extension>
+				</ownedAttribute>
+			</ownedMember>
+		</ownedMember>
+		<ownedMember isAbstract="false" isLeaf="false" name="Component6" visibility="public" xmi:id="NVoJLuyCiu1SNw6D" xmi:type="uml:Package">
+			<xmi:Extension extender="Visual Paradigm for UML">
+				<isRoot xmi:value="false"/>
+				<qualityScore value="26"/>
+				<qualityReason value="2&#9;2&#10;5&#9;5"/>
+				<subdiagram xmi:value="VVIJLuyCiu1SNw59"/>
+			</xmi:Extension>
+			<ownedMember isAbstract="false" isActive="false" isLeaf="false" name="Collection" visibility="public" xmi:id="Jc2JLuyCiu1SNw6o" xmi:type="uml:Class">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<isRoot xmi:value="false"/>
+					<modelType value="Class"/>
+					<businessModel xmi:value="false"/>
+					<qualityScore value="97"/>
+					<qualityReason value="2&#9;2"/>
+					<appliedStereotype xmi:value="Class_prov:type_id"/>
+				</xmi:Extension>
+				<generalization general="m6xjmuyEwTiAAgLk" xmi:id="3iRJLuyCiu1SNw6t" xmi:type="uml:Generalization">
+					<xmi:Extension extender="Visual Paradigm for UML">
+						<qualityScore value="100"/>
+					</xmi:Extension>
+				</generalization>
+			</ownedMember>
+			<ownedMember isAbstract="false" isActive="false" isLeaf="false" name="Dictionary" visibility="public" xmi:id="L9xJLuyCiu1SNw61" xmi:type="uml:Class">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<isRoot xmi:value="false"/>
+					<modelType value="Class"/>
+					<businessModel xmi:value="false"/>
+					<qualityScore value="97"/>
+					<qualityReason value="2&#9;2"/>
+					<appliedStereotype xmi:value="Class_prov:type_id"/>
+				</xmi:Extension>
+				<generalization general="Jc2JLuyCiu1SNw6o" xmi:id="ouFJLuyCiu1SNw6_" xmi:type="uml:Generalization">
+					<xmi:Extension extender="Visual Paradigm for UML">
+						<qualityScore value="100"/>
+					</xmi:Extension>
+				</generalization>
+				<ownedAttribute aggregation="none" association="YmaybuyCiu1SNxGR" isDerived="false" isNavigable="true" type="L9xJLuyCiu1SNw61" xmi:id="sMoybuyCiu1SNxF9" xmi:type="uml:Property">
+					<xmi:Extension extender="Visual Paradigm for UML">
+						<associationEnd/>
+						<qualifier name="" xmi:id="sMoybuyCiu1SNxF." xmi:type="qualifier">
+							<xmi:Extension extender="Visual Paradigm for UML">
+								<qualityScore value="-1"/>
+							</xmi:Extension>
+						</qualifier>
+						<qualityScore value="-1"/>
+					</xmi:Extension>
+				</ownedAttribute>
+				<ownedAttribute aggregation="none" association="YmaybuyCiu1SNxGR" isDerived="false" type="L9xJLuyCiu1SNw61" xmi:id="MMoybuyCiu1SNxF7" xmi:type="uml:Property">
+					<xmi:Extension extender="Visual Paradigm for UML">
+						<associationEnd/>
+						<qualifier name="" xmi:id="sMoybuyCiu1SNxF8" xmi:type="qualifier">
+							<xmi:Extension extender="Visual Paradigm for UML">
+								<qualityScore value="-1"/>
+							</xmi:Extension>
+						</qualifier>
+						<qualityScore value="95"/>
+						<qualityReason value="1&#9;1"/>
+					</xmi:Extension>
+				</ownedAttribute>
+				<ownedAttribute aggregation="none" association="Oa6BHuyCiu1SNxLh" isDerived="false" type="L9xJLuyCiu1SNw61" xmi:id="m4aBHuyCiu1SNxLb" xmi:type="uml:Property">
+					<xmi:Extension extender="Visual Paradigm for UML">
+						<associationEnd/>
+						<qualifier name="" xmi:id="m4aBHuyCiu1SNxLc" xmi:type="qualifier">
+							<xmi:Extension extender="Visual Paradigm for UML">
+								<qualityScore value="-1"/>
+							</xmi:Extension>
+						</qualifier>
+						<qualityScore value="95"/>
+						<qualityReason value="1&#9;1"/>
+					</xmi:Extension>
+				</ownedAttribute>
+				<ownedAttribute aggregation="none" association="Oa6BHuyCiu1SNxLh" isDerived="false" isNavigable="true" type="L9xJLuyCiu1SNw61" xmi:id="m4aBHuyCiu1SNxLZ" xmi:type="uml:Property">
+					<xmi:Extension extender="Visual Paradigm for UML">
+						<associationEnd/>
+						<qualifier name="" xmi:id="m4aBHuyCiu1SNxLa" xmi:type="qualifier">
+							<xmi:Extension extender="Visual Paradigm for UML">
+								<qualityScore value="-1"/>
+							</xmi:Extension>
+						</qualifier>
+						<qualityScore value="-1"/>
+					</xmi:Extension>
+				</ownedAttribute>
+				<ownedAttribute aggregation="none" association="ThihHuyCiu1SNxMu" isDerived="false" type="h_YSbuyCiu1SNxFP" xmi:id="SA4hHuyCiu1SNxMb" xmi:type="uml:Property">
+					<xmi:Extension extender="Visual Paradigm for UML">
+						<associationEnd/>
+						<qualifier name="" xmi:id="SA4hHuyCiu1SNxMc" xmi:type="qualifier">
+							<xmi:Extension extender="Visual Paradigm for UML">
+								<qualityScore value="-1"/>
+							</xmi:Extension>
+						</qualifier>
+						<qualityScore value="-1"/>
+					</xmi:Extension>
+				</ownedAttribute>
+			</ownedMember>
+			<ownedMember isAbstract="false" isActive="false" isLeaf="false" name="Key" visibility="public" xmi:id="Xw_ibuyCiu1SNxFK" xmi:type="uml:Class">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<isRoot xmi:value="false"/>
+					<modelType value="Class"/>
+					<businessModel xmi:value="false"/>
+					<qualityScore value="97"/>
+					<qualityReason value="2&#9;2"/>
+					<appliedStereotype xmi:value="Class_Struct_id"/>
+				</xmi:Extension>
+			</ownedMember>
+			<ownedMember isAbstract="false" isActive="false" isLeaf="false" name="Pair" visibility="public" xmi:id="h_YSbuyCiu1SNxFP" xmi:type="uml:Class">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<isRoot xmi:value="false"/>
+					<modelType value="Class"/>
+					<businessModel xmi:value="false"/>
+					<qualityScore value="97"/>
+					<qualityReason value="2&#9;2"/>
+				</xmi:Extension>
+				<ownedAttribute aggregation="none" association="ThihHuyCiu1SNxMu" isDerived="false" isNavigable="true" type="L9xJLuyCiu1SNw61" xmi:id="SA4hHuyCiu1SNxMd" xmi:type="uml:Property">
+					<xmi:Extension extender="Visual Paradigm for UML">
+						<associationEnd/>
+						<qualifier name="" xmi:id="SA4hHuyCiu1SNxMe" xmi:type="qualifier">
+							<xmi:Extension extender="Visual Paradigm for UML">
+								<qualityScore value="-1"/>
+							</xmi:Extension>
+						</qualifier>
+						<qualityScore value="-1"/>
+					</xmi:Extension>
+				</ownedAttribute>
+			</ownedMember>
+			<ownedMember isAbstract="false" isActive="false" isLeaf="false" name="insertion" visibility="public" xmi:id="YmaybuyCiu1SNxGR" xmi:type="uml:AssociationClass">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<isRoot xmi:value="false"/>
+					<modelType value="Class"/>
+					<association isAbstract="false" isDerived="false" isLeaf="false" name="insertion" xmi:id="MMoybuyCiu1SNxF6"/>
+					<associationClass from="MMoybuyCiu1SNxF6" to="YmaybuyCiu1SNxGR" xmi:id="fpOybuyCiu1SNxGW"/>
+					<businessModel xmi:value="false"/>
+					<qualityScore value="97"/>
+					<qualityReason value="2&#9;2"/>
+				</xmi:Extension>
+				<memberEnd xmi:idref="MMoybuyCiu1SNxF7"/>
+				<memberEnd xmi:idref="sMoybuyCiu1SNxF9"/>
+				<ownedAttribute aggregation="none" isDerived="false" name="id" ownerScope="instance" xmi:id="8Bp9HuyCiu1SNxNI" xmi:type="uml:Property">
+					<xmi:Extension extender="Visual Paradigm for UML">
+						<attribute/>
+						<isVisble xmi:value="true"/>
+						<qualityScore value="97"/>
+						<qualityReason value="2&#9;2"/>
+					</xmi:Extension>
+				</ownedAttribute>
+				<ownedAttribute aggregation="none" isDerived="false" name="attributes" ownerScope="instance" xmi:id="gq59HuyCiu1SNxNK" xmi:type="uml:Property">
+					<xmi:Extension extender="Visual Paradigm for UML">
+						<attribute/>
+						<isVisble xmi:value="true"/>
+						<qualityScore value="97"/>
+						<qualityReason value="2&#9;2"/>
+					</xmi:Extension>
+				</ownedAttribute>
+			</ownedMember>
+			<ownedMember isAbstract="false" isActive="false" isLeaf="false" name="removal" visibility="public" xmi:id="Oa6BHuyCiu1SNxLh" xmi:type="uml:AssociationClass">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<isRoot xmi:value="false"/>
+					<modelType value="Class"/>
+					<association isAbstract="false" isDerived="false" isLeaf="false" name="removal" xmi:id="m4aBHuyCiu1SNxLY"/>
+					<associationClass from="m4aBHuyCiu1SNxLY" to="Oa6BHuyCiu1SNxLh" xmi:id="Lu.BHuyCiu1SNxLr"/>
+					<businessModel xmi:value="false"/>
+					<qualityScore value="97"/>
+					<qualityReason value="2&#9;2"/>
+				</xmi:Extension>
+				<memberEnd xmi:idref="m4aBHuyCiu1SNxLZ"/>
+				<memberEnd xmi:idref="m4aBHuyCiu1SNxLb"/>
+				<ownedAttribute aggregation="none" isDerived="false" name="id" ownerScope="instance" xmi:id="KV99HuyCiu1SNxNW" xmi:type="uml:Property">
+					<xmi:Extension extender="Visual Paradigm for UML">
+						<attribute/>
+						<isVisble xmi:value="true"/>
+						<qualityScore value="97"/>
+						<qualityReason value="2&#9;2"/>
+					</xmi:Extension>
+				</ownedAttribute>
+				<ownedAttribute aggregation="none" isDerived="false" name="attributes" ownerScope="instance" xmi:id="Yyj9HuyCiu1SNxNY" xmi:type="uml:Property">
+					<xmi:Extension extender="Visual Paradigm for UML">
+						<attribute/>
+						<isVisble xmi:value="true"/>
+						<qualityScore value="97"/>
+						<qualityReason value="2&#9;2"/>
+					</xmi:Extension>
+				</ownedAttribute>
+			</ownedMember>
+			<ownedMember isAbstract="false" isActive="false" isLeaf="false" name="memberOf" visibility="public" xmi:id="ThihHuyCiu1SNxMu" xmi:type="uml:AssociationClass">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<isRoot xmi:value="false"/>
+					<modelType value="Class"/>
+					<association isAbstract="false" isDerived="false" isLeaf="false" name="memberOf" xmi:id="SA4hHuyCiu1SNxMa"/>
+					<associationClass from="SA4hHuyCiu1SNxMa" to="ThihHuyCiu1SNxMu" xmi:id="XpGhHuyCiu1SNxM0"/>
+					<businessModel xmi:value="false"/>
+					<qualityScore value="97"/>
+					<qualityReason value="2&#9;2"/>
+				</xmi:Extension>
+				<memberEnd xmi:idref="SA4hHuyCiu1SNxMb"/>
+				<memberEnd xmi:idref="SA4hHuyCiu1SNxMd"/>
+				<ownedAttribute aggregation="none" isDerived="false" name="id" ownerScope="instance" xmi:id="cM19HuyCiu1SNxNO" xmi:type="uml:Property">
+					<xmi:Extension extender="Visual Paradigm for UML">
+						<attribute/>
+						<isVisble xmi:value="true"/>
+						<qualityScore value="97"/>
+						<qualityReason value="2&#9;2"/>
+					</xmi:Extension>
+				</ownedAttribute>
+				<ownedAttribute aggregation="none" isDerived="false" name="attributes" ownerScope="instance" xmi:id="UXN9HuyCiu1SNxNQ" xmi:type="uml:Property">
+					<xmi:Extension extender="Visual Paradigm for UML">
+						<attribute/>
+						<isVisble xmi:value="true"/>
+						<qualityScore value="97"/>
+						<qualityReason value="2&#9;2"/>
+					</xmi:Extension>
+				</ownedAttribute>
+			</ownedMember>
+		</ownedMember>
+		<ownedMember name="type" xmi:id="Class_type_id" xmi:type="uml:Stereotype">
+			<xmi:Extension extender="Visual Paradigm for UML">
+				<baseType value="Class"/>
+				<qualityScore value="-1"/>
+			</xmi:Extension>
+		</ownedMember>
+		<ownedMember name="Struct" xmi:id="Class_Struct_id" xmi:type="uml:Stereotype">
+			<xmi:Extension extender="Visual Paradigm for UML">
+				<baseType value="Class"/>
+				<qualityScore value="-1"/>
+			</xmi:Extension>
+		</ownedMember>
+		<ownedMember name="prov:type" xmi:id="Class_prov:type_id" xmi:type="uml:Stereotype">
+			<xmi:Extension extender="Visual Paradigm for UML">
+				<baseType value="Class"/>
+				<qualityScore value="-1"/>
+			</xmi:Extension>
 		</ownedMember>
 		<ownedMember isAbstract="false" isDerived="false" isLeaf="false" name="starter" xmi:id="v9.uWuyEwTiAAgXF" xmi:type="uml:Association">
 			<memberEnd xmi:idref="v9.uWuyEwTiAAgXG"/>
@@ -6878,66 +7610,6 @@
 				<qualityReason value="2&#9;2"/>
 			</xmi:Extension>
 		</ownedMember>
-		<ownedMember isAbstract="false" isDerived="false" isLeaf="false" name="wasAttributedTo" xmi:id="6.htBuyCiu1SNwgL" xmi:type="uml:Association">
-			<memberEnd xmi:idref="6.htBuyCiu1SNwgM"/>
-			<ownedEnd aggregation="none" association="6.htBuyCiu1SNwgL" isDerived="false" type="m6xjmuyEwTiAAgLk" xmi:id="6.htBuyCiu1SNwgM" xmi:type="uml:Property">
-				<xmi:Extension extender="Visual Paradigm for UML">
-					<associationEnd/>
-					<qualifier name="" xmi:id="6.htBuyCiu1SNwgN" xmi:type="qualifier">
-						<xmi:Extension extender="Visual Paradigm for UML">
-							<qualityScore value="-1"/>
-						</xmi:Extension>
-					</qualifier>
-					<qualityScore value="-1"/>
-				</xmi:Extension>
-			</ownedEnd>
-			<memberEnd xmi:idref="6.htBuyCiu1SNwgO"/>
-			<ownedEnd aggregation="none" association="6.htBuyCiu1SNwgL" isDerived="false" isNavigable="true" type="2VbNBuyCiu1SNwe6" xmi:id="6.htBuyCiu1SNwgO" xmi:type="uml:Property">
-				<xmi:Extension extender="Visual Paradigm for UML">
-					<associationEnd/>
-					<qualifier name="" xmi:id="6.htBuyCiu1SNwgP" xmi:type="qualifier">
-						<xmi:Extension extender="Visual Paradigm for UML">
-							<qualityScore value="-1"/>
-						</xmi:Extension>
-					</qualifier>
-					<qualityScore value="-1"/>
-				</xmi:Extension>
-			</ownedEnd>
-			<xmi:Extension extender="Visual Paradigm for UML">
-				<qualityScore value="97"/>
-				<qualityReason value="2&#9;2"/>
-			</xmi:Extension>
-		</ownedMember>
-		<ownedMember isAbstract="false" isDerived="false" isLeaf="false" name="wasAssociatedWith" xmi:id="Uf5tBuyCiu1SNwgY" xmi:type="uml:Association">
-			<memberEnd xmi:idref="Uf5tBuyCiu1SNwgZ"/>
-			<ownedEnd aggregation="none" association="Uf5tBuyCiu1SNwgY" isDerived="false" type="vTljmuyEwTiAAgLp" xmi:id="Uf5tBuyCiu1SNwgZ" xmi:type="uml:Property">
-				<xmi:Extension extender="Visual Paradigm for UML">
-					<associationEnd/>
-					<qualifier name="" xmi:id="Uf5tBuyCiu1SNwga" xmi:type="qualifier">
-						<xmi:Extension extender="Visual Paradigm for UML">
-							<qualityScore value="-1"/>
-						</xmi:Extension>
-					</qualifier>
-					<qualityScore value="-1"/>
-				</xmi:Extension>
-			</ownedEnd>
-			<memberEnd xmi:idref="Uf5tBuyCiu1SNwgb"/>
-			<ownedEnd aggregation="none" association="Uf5tBuyCiu1SNwgY" isDerived="false" isNavigable="true" type="2VbNBuyCiu1SNwe6" xmi:id="Uf5tBuyCiu1SNwgb" xmi:type="uml:Property">
-				<xmi:Extension extender="Visual Paradigm for UML">
-					<associationEnd/>
-					<qualifier name="" xmi:id="Uf5tBuyCiu1SNwgc" xmi:type="qualifier">
-						<xmi:Extension extender="Visual Paradigm for UML">
-							<qualityScore value="-1"/>
-						</xmi:Extension>
-					</qualifier>
-					<qualityScore value="-1"/>
-				</xmi:Extension>
-			</ownedEnd>
-			<xmi:Extension extender="Visual Paradigm for UML">
-				<qualityScore value="97"/>
-				<qualityReason value="2&#9;2"/>
-			</xmi:Extension>
-		</ownedMember>
 		<ownedMember isAbstract="false" isDerived="false" isLeaf="false" name="wasDerivedFrom" xmi:id="CNrtBuyCiu1SNwgz" xmi:type="uml:Association">
 			<memberEnd xmi:idref="CNrtBuyCiu1SNwg0"/>
 			<ownedEnd aggregation="none" association="CNrtBuyCiu1SNwgz" isDerived="false" isNavigable="true" type="m6xjmuyEwTiAAgLk" xmi:id="CNrtBuyCiu1SNwg0" xmi:type="uml:Property">
@@ -6998,13 +7670,557 @@
 				<qualityReason value="2&#9;2"/>
 			</xmi:Extension>
 		</ownedMember>
+		<ownedMember isAbstract="false" isDerived="false" isLeaf="false" name="time" xmi:id="fOWGjuyCiu1SNwnM" xmi:type="uml:Association">
+			<memberEnd xmi:idref="fOWGjuyCiu1SNwnN"/>
+			<ownedEnd aggregation="none" association="fOWGjuyCiu1SNwnM" isDerived="false" type="9un1WuyEwTiAAgcK" xmi:id="fOWGjuyCiu1SNwnN" xmi:type="uml:Property">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<associationEnd/>
+					<qualifier name="" xmi:id="_OWGjuyCiu1SNwnO" xmi:type="qualifier">
+						<xmi:Extension extender="Visual Paradigm for UML">
+							<qualityScore value="-1"/>
+						</xmi:Extension>
+					</qualifier>
+					<qualityScore value="95"/>
+					<qualityReason value="1&#9;1"/>
+				</xmi:Extension>
+			</ownedEnd>
+			<memberEnd xmi:idref="_OWGjuyCiu1SNwnP"/>
+			<ownedEnd aggregation="none" association="fOWGjuyCiu1SNwnM" isDerived="false" isNavigable="true" type="n0UGjuyCiu1SNwmv" xmi:id="_OWGjuyCiu1SNwnP" xmi:type="uml:Property">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<associationEnd/>
+					<qualifier name="" xmi:id="_OWGjuyCiu1SNwnQ" xmi:type="qualifier">
+						<xmi:Extension extender="Visual Paradigm for UML">
+							<qualityScore value="-1"/>
+						</xmi:Extension>
+					</qualifier>
+					<qualityScore value="-1"/>
+				</xmi:Extension>
+			</ownedEnd>
+			<xmi:Extension extender="Visual Paradigm for UML">
+				<qualityScore value="97"/>
+				<qualityReason value="2&#9;2"/>
+			</xmi:Extension>
+		</ownedMember>
+		<ownedMember isAbstract="false" isDerived="false" isLeaf="false" xmi:id="t7OGjuyCiu1SNwnU" xmi:type="uml:Association">
+			<memberEnd xmi:idref="t7OGjuyCiu1SNwnV"/>
+			<ownedEnd aggregation="none" association="t7OGjuyCiu1SNwnU" isDerived="false" name="" type="LvBeWuyEwTiAAgYC" xmi:id="t7OGjuyCiu1SNwnV" xmi:type="uml:Property">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<associationEnd/>
+					<qualifier name="" xmi:id="d7OGjuyCiu1SNwnW" xmi:type="qualifier">
+						<xmi:Extension extender="Visual Paradigm for UML">
+							<qualityScore value="-1"/>
+						</xmi:Extension>
+					</qualifier>
+					<qualityScore value="95"/>
+					<qualityReason value="1&#9;1"/>
+				</xmi:Extension>
+			</ownedEnd>
+			<memberEnd xmi:idref="d7OGjuyCiu1SNwnX"/>
+			<ownedEnd aggregation="none" association="t7OGjuyCiu1SNwnU" isDerived="false" isNavigable="true" type="n0UGjuyCiu1SNwmv" xmi:id="d7OGjuyCiu1SNwnX" xmi:type="uml:Property">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<associationEnd/>
+					<qualifier name="" xmi:id="d7OGjuyCiu1SNwnY" xmi:type="qualifier">
+						<xmi:Extension extender="Visual Paradigm for UML">
+							<qualityScore value="-1"/>
+						</xmi:Extension>
+					</qualifier>
+					<qualityScore value="-1"/>
+				</xmi:Extension>
+			</ownedEnd>
+			<xmi:Extension extender="Visual Paradigm for UML">
+				<qualityScore value="100"/>
+			</xmi:Extension>
+		</ownedMember>
+		<ownedMember isAbstract="false" isDerived="false" isLeaf="false" name="startTime" xmi:id="1YFGjuyCiu1SNwnk" xmi:type="uml:Association">
+			<memberEnd xmi:idref="1YFGjuyCiu1SNwnl"/>
+			<ownedEnd aggregation="none" association="1YFGjuyCiu1SNwnk" isDerived="false" type="vTljmuyEwTiAAgLp" xmi:id="1YFGjuyCiu1SNwnl" xmi:type="uml:Property">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<associationEnd/>
+					<qualifier name="" xmi:id="1YFGjuyCiu1SNwnm" xmi:type="qualifier">
+						<xmi:Extension extender="Visual Paradigm for UML">
+							<qualityScore value="-1"/>
+						</xmi:Extension>
+					</qualifier>
+					<qualityScore value="95"/>
+					<qualityReason value="1&#9;1"/>
+				</xmi:Extension>
+			</ownedEnd>
+			<memberEnd xmi:idref="1YFGjuyCiu1SNwnn"/>
+			<ownedEnd aggregation="none" association="1YFGjuyCiu1SNwnk" isDerived="false" isNavigable="true" type="n0UGjuyCiu1SNwmv" xmi:id="1YFGjuyCiu1SNwnn" xmi:type="uml:Property">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<associationEnd/>
+					<qualifier name="" xmi:id="1YFGjuyCiu1SNwno" xmi:type="qualifier">
+						<xmi:Extension extender="Visual Paradigm for UML">
+							<qualityScore value="-1"/>
+						</xmi:Extension>
+					</qualifier>
+					<qualityScore value="-1"/>
+				</xmi:Extension>
+			</ownedEnd>
+			<xmi:Extension extender="Visual Paradigm for UML">
+				<qualityScore value="97"/>
+				<qualityReason value="2&#9;2"/>
+			</xmi:Extension>
+		</ownedMember>
+		<ownedMember isAbstract="false" isDerived="false" isLeaf="false" name="endTime" xmi:id="qKNGjuyCiu1SNwnu" xmi:type="uml:Association">
+			<memberEnd xmi:idref="aKNGjuyCiu1SNwnv"/>
+			<ownedEnd aggregation="none" association="qKNGjuyCiu1SNwnu" isDerived="false" type="vTljmuyEwTiAAgLp" xmi:id="aKNGjuyCiu1SNwnv" xmi:type="uml:Property">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<associationEnd/>
+					<qualifier name="" xmi:id="aKNGjuyCiu1SNwnw" xmi:type="qualifier">
+						<xmi:Extension extender="Visual Paradigm for UML">
+							<qualityScore value="-1"/>
+						</xmi:Extension>
+					</qualifier>
+					<qualityScore value="95"/>
+					<qualityReason value="1&#9;1"/>
+				</xmi:Extension>
+			</ownedEnd>
+			<memberEnd xmi:idref="aKNGjuyCiu1SNwnx"/>
+			<ownedEnd aggregation="none" association="qKNGjuyCiu1SNwnu" isDerived="false" isNavigable="true" type="n0UGjuyCiu1SNwmv" xmi:id="aKNGjuyCiu1SNwnx" xmi:type="uml:Property">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<associationEnd/>
+					<qualifier name="" xmi:id="aKNGjuyCiu1SNwny" xmi:type="qualifier">
+						<xmi:Extension extender="Visual Paradigm for UML">
+							<qualityScore value="-1"/>
+						</xmi:Extension>
+					</qualifier>
+					<qualityScore value="-1"/>
+				</xmi:Extension>
+			</ownedEnd>
+			<xmi:Extension extender="Visual Paradigm for UML">
+				<qualityScore value="97"/>
+				<qualityReason value="2&#9;2"/>
+			</xmi:Extension>
+		</ownedMember>
+		<ownedMember isAbstract="false" isDerived="false" isLeaf="false" name="time" xmi:id="yvTGjuyCiu1SNwn8" xmi:type="uml:Association">
+			<memberEnd xmi:idref="yvTGjuyCiu1SNwn9"/>
+			<ownedEnd aggregation="none" association="yvTGjuyCiu1SNwn8" isDerived="false" type="q8f1WuyEwTiAAgcQ" xmi:id="yvTGjuyCiu1SNwn9" xmi:type="uml:Property">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<associationEnd/>
+					<qualifier name="" xmi:id="yvTGjuyCiu1SNwn." xmi:type="qualifier">
+						<xmi:Extension extender="Visual Paradigm for UML">
+							<qualityScore value="-1"/>
+						</xmi:Extension>
+					</qualifier>
+					<qualityScore value="95"/>
+					<qualityReason value="1&#9;1"/>
+				</xmi:Extension>
+			</ownedEnd>
+			<memberEnd xmi:idref="yvTGjuyCiu1SNwn_"/>
+			<ownedEnd aggregation="none" association="yvTGjuyCiu1SNwn8" isDerived="false" isNavigable="true" type="n0UGjuyCiu1SNwmv" xmi:id="yvTGjuyCiu1SNwn_" xmi:type="uml:Property">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<associationEnd/>
+					<qualifier name="" xmi:id="yvTGjuyCiu1SNwoA" xmi:type="qualifier">
+						<xmi:Extension extender="Visual Paradigm for UML">
+							<qualityScore value="-1"/>
+						</xmi:Extension>
+					</qualifier>
+					<qualityScore value="-1"/>
+				</xmi:Extension>
+			</ownedEnd>
+			<xmi:Extension extender="Visual Paradigm for UML">
+				<qualityScore value="97"/>
+				<qualityReason value="2&#9;2"/>
+			</xmi:Extension>
+		</ownedMember>
+		<ownedMember isAbstract="false" isDerived="false" isLeaf="false" xmi:id="fyAmjuyCiu1SNwoH" xmi:type="uml:Association">
+			<memberEnd xmi:idref="fyAmjuyCiu1SNwoI"/>
+			<ownedEnd aggregation="none" association="fyAmjuyCiu1SNwoH" isDerived="false" type="_i1UWuyEwTiAAgSK" xmi:id="fyAmjuyCiu1SNwoI" xmi:type="uml:Property">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<associationEnd/>
+					<qualifier name="" xmi:id="fyAmjuyCiu1SNwoJ" xmi:type="qualifier">
+						<xmi:Extension extender="Visual Paradigm for UML">
+							<qualityScore value="-1"/>
+						</xmi:Extension>
+					</qualifier>
+					<qualityScore value="95"/>
+					<qualityReason value="1&#9;1"/>
+				</xmi:Extension>
+			</ownedEnd>
+			<memberEnd xmi:idref="fyAmjuyCiu1SNwoK"/>
+			<ownedEnd aggregation="none" association="fyAmjuyCiu1SNwoH" isDerived="false" isNavigable="true" type="n0UGjuyCiu1SNwmv" xmi:id="fyAmjuyCiu1SNwoK" xmi:type="uml:Property">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<associationEnd/>
+					<qualifier name="" xmi:id="fyAmjuyCiu1SNwoL" xmi:type="qualifier">
+						<xmi:Extension extender="Visual Paradigm for UML">
+							<qualityScore value="-1"/>
+						</xmi:Extension>
+					</qualifier>
+					<qualityScore value="95"/>
+					<qualityReason value="1&#9;1"/>
+				</xmi:Extension>
+			</ownedEnd>
+			<xmi:Extension extender="Visual Paradigm for UML">
+				<qualityScore value="100"/>
+			</xmi:Extension>
+		</ownedMember>
+		<ownedMember isAbstract="false" isDerived="false" isLeaf="false" name="plan" xmi:id="tG7RzuyCiu1SNwzq" xmi:type="uml:Association">
+			<memberEnd xmi:idref="tG7RzuyCiu1SNwzr"/>
+			<ownedEnd aggregation="none" association="tG7RzuyCiu1SNwzq" isDerived="false" type="WdORzuyCiu1SNwzI" xmi:id="tG7RzuyCiu1SNwzr" xmi:type="uml:Property">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<associationEnd/>
+					<qualifier name="" xmi:id="tG7RzuyCiu1SNwzs" xmi:type="qualifier">
+						<xmi:Extension extender="Visual Paradigm for UML">
+							<qualityScore value="-1"/>
+						</xmi:Extension>
+					</qualifier>
+					<qualityScore value="-1"/>
+				</xmi:Extension>
+			</ownedEnd>
+			<memberEnd xmi:idref="tG7RzuyCiu1SNwzt"/>
+			<ownedEnd aggregation="none" association="tG7RzuyCiu1SNwzq" isDerived="false" isNavigable="true" type="CIdRzuyCiu1SNwzZ" xmi:id="tG7RzuyCiu1SNwzt" xmi:type="uml:Property">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<associationEnd/>
+					<qualifier name="" xmi:id="tG7RzuyCiu1SNwzu" xmi:type="qualifier">
+						<xmi:Extension extender="Visual Paradigm for UML">
+							<qualityScore value="-1"/>
+						</xmi:Extension>
+					</qualifier>
+					<qualityScore value="-1"/>
+				</xmi:Extension>
+			</ownedEnd>
+			<xmi:Extension extender="Visual Paradigm for UML">
+				<qualityScore value="97"/>
+				<qualityReason value="2&#9;2"/>
+			</xmi:Extension>
+		</ownedMember>
+		<ownedMember isAbstract="false" isDerived="false" isLeaf="false" name="activity" xmi:id="iyCxzuyCiu1SNw0N" xmi:type="uml:Association">
+			<memberEnd xmi:idref="iyCxzuyCiu1SNw0O"/>
+			<ownedEnd aggregation="none" association="iyCxzuyCiu1SNw0N" isDerived="false" type="qmwxzuyCiu1SNwz5" xmi:id="iyCxzuyCiu1SNw0O" xmi:type="uml:Property">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<associationEnd/>
+					<qualifier name="" xmi:id="iyCxzuyCiu1SNw0P" xmi:type="qualifier">
+						<xmi:Extension extender="Visual Paradigm for UML">
+							<qualityScore value="-1"/>
+						</xmi:Extension>
+					</qualifier>
+					<qualityScore value="95"/>
+					<qualityReason value="1&#9;1"/>
+				</xmi:Extension>
+			</ownedEnd>
+			<memberEnd xmi:idref="iyCxzuyCiu1SNw0Q"/>
+			<ownedEnd aggregation="none" association="iyCxzuyCiu1SNw0N" isDerived="false" isNavigable="true" type="vTljmuyEwTiAAgLp" xmi:id="iyCxzuyCiu1SNw0Q" xmi:type="uml:Property">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<associationEnd/>
+					<qualifier name="" xmi:id="iyCxzuyCiu1SNw0R" xmi:type="qualifier">
+						<xmi:Extension extender="Visual Paradigm for UML">
+							<qualityScore value="-1"/>
+						</xmi:Extension>
+					</qualifier>
+					<qualityScore value="95"/>
+					<qualityReason value="1&#9;1"/>
+				</xmi:Extension>
+			</ownedEnd>
+			<xmi:Extension extender="Visual Paradigm for UML">
+				<qualityScore value="97"/>
+				<qualityReason value="2&#9;2"/>
+			</xmi:Extension>
+		</ownedMember>
+		<ownedMember isAbstract="false" isDerived="false" isLeaf="false" name="alternateOf" xmi:id="AHUpzuyCiu1SNw2V" xmi:type="uml:Association">
+			<memberEnd xmi:idref="AHUpzuyCiu1SNw2W"/>
+			<ownedEnd aggregation="none" association="AHUpzuyCiu1SNw2V" isDerived="false" type="m6xjmuyEwTiAAgLk" xmi:id="AHUpzuyCiu1SNw2W" xmi:type="uml:Property">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<associationEnd/>
+					<qualifier name="" xmi:id="AHUpzuyCiu1SNw2X" xmi:type="qualifier">
+						<xmi:Extension extender="Visual Paradigm for UML">
+							<qualityScore value="-1"/>
+						</xmi:Extension>
+					</qualifier>
+					<qualityScore value="-1"/>
+				</xmi:Extension>
+			</ownedEnd>
+			<memberEnd xmi:idref="AHUpzuyCiu1SNw2Y"/>
+			<ownedEnd aggregation="none" association="AHUpzuyCiu1SNw2V" isDerived="false" isNavigable="true" type="m6xjmuyEwTiAAgLk" xmi:id="AHUpzuyCiu1SNw2Y" xmi:type="uml:Property">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<associationEnd/>
+					<qualifier name="" xmi:id="AHUpzuyCiu1SNw2Z" xmi:type="qualifier">
+						<xmi:Extension extender="Visual Paradigm for UML">
+							<qualityScore value="-1"/>
+						</xmi:Extension>
+					</qualifier>
+					<qualityScore value="-1"/>
+				</xmi:Extension>
+			</ownedEnd>
+			<xmi:Extension extender="Visual Paradigm for UML">
+				<qualityScore value="97"/>
+				<qualityReason value="2&#9;2"/>
+			</xmi:Extension>
+		</ownedMember>
+		<ownedMember isAbstract="false" isDerived="false" isLeaf="false" name="specializationOf" xmi:id="UOcpzuyCiu1SNw2h" xmi:type="uml:Association">
+			<memberEnd xmi:idref="UOcpzuyCiu1SNw2i"/>
+			<ownedEnd aggregation="none" association="UOcpzuyCiu1SNw2h" isDerived="false" type="m6xjmuyEwTiAAgLk" xmi:id="UOcpzuyCiu1SNw2i" xmi:type="uml:Property">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<associationEnd/>
+					<qualifier name="" xmi:id="UOcpzuyCiu1SNw2j" xmi:type="qualifier">
+						<xmi:Extension extender="Visual Paradigm for UML">
+							<qualityScore value="-1"/>
+						</xmi:Extension>
+					</qualifier>
+					<qualityScore value="-1"/>
+				</xmi:Extension>
+			</ownedEnd>
+			<memberEnd xmi:idref="UOcpzuyCiu1SNw2k"/>
+			<ownedEnd aggregation="none" association="UOcpzuyCiu1SNw2h" isDerived="false" isNavigable="true" type="m6xjmuyEwTiAAgLk" xmi:id="UOcpzuyCiu1SNw2k" xmi:type="uml:Property">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<associationEnd/>
+					<qualifier name="" xmi:id="UOcpzuyCiu1SNw2l" xmi:type="qualifier">
+						<xmi:Extension extender="Visual Paradigm for UML">
+							<qualityScore value="-1"/>
+						</xmi:Extension>
+					</qualifier>
+					<qualityScore value="-1"/>
+				</xmi:Extension>
+			</ownedEnd>
+			<xmi:Extension extender="Visual Paradigm for UML">
+				<qualityScore value="97"/>
+				<qualityReason value="2&#9;2"/>
+			</xmi:Extension>
+		</ownedMember>
+		<ownedMember isAbstract="false" isDerived="false" isLeaf="false" name="bundle" xmi:id="ODGRLuyCiu1SNw4f" xmi:type="uml:Association">
+			<memberEnd xmi:idref="ODGRLuyCiu1SNw4g"/>
+			<ownedEnd aggregation="none" association="ODGRLuyCiu1SNw4f" isDerived="false" type="o.cRLuyCiu1SNw4W" xmi:id="ODGRLuyCiu1SNw4g" xmi:type="uml:Property">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<associationEnd/>
+					<qualifier name="" xmi:id="ODGRLuyCiu1SNw4h" xmi:type="qualifier">
+						<xmi:Extension extender="Visual Paradigm for UML">
+							<qualityScore value="-1"/>
+						</xmi:Extension>
+					</qualifier>
+					<qualityScore value="95"/>
+					<qualityReason value="1&#9;1"/>
+				</xmi:Extension>
+			</ownedEnd>
+			<memberEnd xmi:idref="ODGRLuyCiu1SNw4i"/>
+			<ownedEnd aggregation="none" association="ODGRLuyCiu1SNw4f" isDerived="false" isNavigable="true" type="XlvhLuyCiu1SNw38" xmi:id="ODGRLuyCiu1SNw4i" xmi:type="uml:Property">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<associationEnd/>
+					<qualifier name="" xmi:id="ODGRLuyCiu1SNw4j" xmi:type="qualifier">
+						<xmi:Extension extender="Visual Paradigm for UML">
+							<qualityScore value="-1"/>
+						</xmi:Extension>
+					</qualifier>
+					<qualityScore value="-1"/>
+				</xmi:Extension>
+			</ownedEnd>
+			<xmi:Extension extender="Visual Paradigm for UML">
+				<qualityScore value="97"/>
+				<qualityReason value="2&#9;2"/>
+			</xmi:Extension>
+		</ownedMember>
+		<ownedMember isAbstract="false" isDerived="false" isLeaf="false" name="target" xmi:id="mBJRLuyCiu1SNw4z" xmi:type="uml:Association">
+			<memberEnd xmi:idref="mBJRLuyCiu1SNw40"/>
+			<ownedEnd aggregation="none" association="mBJRLuyCiu1SNw4z" isDerived="false" type="o.cRLuyCiu1SNw4W" xmi:id="mBJRLuyCiu1SNw40" xmi:type="uml:Property">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<associationEnd/>
+					<qualifier name="" xmi:id="mBJRLuyCiu1SNw41" xmi:type="qualifier">
+						<xmi:Extension extender="Visual Paradigm for UML">
+							<qualityScore value="-1"/>
+						</xmi:Extension>
+					</qualifier>
+					<qualityScore value="95"/>
+					<qualityReason value="1&#9;1"/>
+				</xmi:Extension>
+			</ownedEnd>
+			<memberEnd xmi:idref="WBJRLuyCiu1SNw42"/>
+			<ownedEnd aggregation="none" association="mBJRLuyCiu1SNw4z" isDerived="false" isNavigable="true" type="m6xjmuyEwTiAAgLk" xmi:id="WBJRLuyCiu1SNw42" xmi:type="uml:Property">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<associationEnd/>
+					<qualifier name="" xmi:id="WBJRLuyCiu1SNw43" xmi:type="qualifier">
+						<xmi:Extension extender="Visual Paradigm for UML">
+							<qualityScore value="-1"/>
+						</xmi:Extension>
+					</qualifier>
+					<qualityScore value="-1"/>
+				</xmi:Extension>
+			</ownedEnd>
+			<xmi:Extension extender="Visual Paradigm for UML">
+				<qualityScore value="97"/>
+				<qualityReason value="2&#9;2"/>
+			</xmi:Extension>
+		</ownedMember>
+		<ownedMember isAbstract="false" isDerived="false" isLeaf="false" xmi:id="b1USbuyCiu1SNxFU" xmi:type="uml:Association">
+			<memberEnd xmi:idref="b1USbuyCiu1SNxFV"/>
+			<ownedEnd aggregation="none" association="b1USbuyCiu1SNxFU" isDerived="false" isNavigable="true" type="h_YSbuyCiu1SNxFP" xmi:id="b1USbuyCiu1SNxFV" xmi:type="uml:Property">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<associationEnd/>
+					<qualifier name="" xmi:id="b1USbuyCiu1SNxFW" xmi:type="qualifier">
+						<xmi:Extension extender="Visual Paradigm for UML">
+							<qualityScore value="-1"/>
+						</xmi:Extension>
+					</qualifier>
+					<qualityScore value="-1"/>
+				</xmi:Extension>
+			</ownedEnd>
+			<memberEnd xmi:idref="b1USbuyCiu1SNxFX"/>
+			<ownedEnd aggregation="none" association="b1USbuyCiu1SNxFU" isDerived="false" isNavigable="true" type="Xw_ibuyCiu1SNxFK" xmi:id="b1USbuyCiu1SNxFX" xmi:type="uml:Property">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<associationEnd/>
+					<qualifier name="" xmi:id="b1USbuyCiu1SNxFY" xmi:type="qualifier">
+						<xmi:Extension extender="Visual Paradigm for UML">
+							<qualityScore value="-1"/>
+						</xmi:Extension>
+					</qualifier>
+					<qualityScore value="-1"/>
+				</xmi:Extension>
+			</ownedEnd>
+			<xmi:Extension extender="Visual Paradigm for UML">
+				<qualityScore value="100"/>
+			</xmi:Extension>
+		</ownedMember>
+		<ownedMember isAbstract="false" isDerived="false" isLeaf="false" xmi:id="gCsSbuyCiu1SNxFe" xmi:type="uml:Association">
+			<memberEnd xmi:idref="gCsSbuyCiu1SNxFf"/>
+			<ownedEnd aggregation="none" association="gCsSbuyCiu1SNxFe" isDerived="false" isNavigable="true" type="h_YSbuyCiu1SNxFP" xmi:id="gCsSbuyCiu1SNxFf" xmi:type="uml:Property">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<associationEnd/>
+					<qualifier name="" xmi:id="gCsSbuyCiu1SNxFg" xmi:type="qualifier">
+						<xmi:Extension extender="Visual Paradigm for UML">
+							<qualityScore value="-1"/>
+						</xmi:Extension>
+					</qualifier>
+					<qualityScore value="-1"/>
+				</xmi:Extension>
+			</ownedEnd>
+			<memberEnd xmi:idref="gCsSbuyCiu1SNxFh"/>
+			<ownedEnd aggregation="none" association="gCsSbuyCiu1SNxFe" isDerived="false" isNavigable="true" type="m6xjmuyEwTiAAgLk" xmi:id="gCsSbuyCiu1SNxFh" xmi:type="uml:Property">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<associationEnd/>
+					<qualifier name="" xmi:id="gCsSbuyCiu1SNxFi" xmi:type="qualifier">
+						<xmi:Extension extender="Visual Paradigm for UML">
+							<qualityScore value="-1"/>
+						</xmi:Extension>
+					</qualifier>
+					<qualityScore value="-1"/>
+				</xmi:Extension>
+			</ownedEnd>
+			<xmi:Extension extender="Visual Paradigm for UML">
+				<qualityScore value="100"/>
+			</xmi:Extension>
+		</ownedMember>
+		<ownedMember isAbstract="false" isDerived="false" isLeaf="false" xmi:id="QjBybuyCiu1SNxGg" xmi:type="uml:Association">
+			<memberEnd xmi:idref="QjBybuyCiu1SNxGh"/>
+			<ownedEnd aggregation="none" association="QjBybuyCiu1SNxGg" isDerived="false" isNavigable="true" type="YmaybuyCiu1SNxGR" xmi:id="QjBybuyCiu1SNxGh" xmi:type="uml:Property">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<associationEnd/>
+					<qualifier name="" xmi:id="QjBybuyCiu1SNxGi" xmi:type="qualifier">
+						<xmi:Extension extender="Visual Paradigm for UML">
+							<qualityScore value="-1"/>
+						</xmi:Extension>
+					</qualifier>
+					<qualityScore value="-1"/>
+				</xmi:Extension>
+			</ownedEnd>
+			<memberEnd xmi:idref="QjBybuyCiu1SNxGj"/>
+			<ownedEnd aggregation="none" association="QjBybuyCiu1SNxGg" isDerived="false" isNavigable="true" type="h_YSbuyCiu1SNxFP" xmi:id="QjBybuyCiu1SNxGj" xmi:type="uml:Property">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<associationEnd/>
+					<qualifier name="" xmi:id="QjBybuyCiu1SNxGk" xmi:type="qualifier">
+						<xmi:Extension extender="Visual Paradigm for UML">
+							<qualityScore value="-1"/>
+						</xmi:Extension>
+					</qualifier>
+					<qualityScore value="-1"/>
+				</xmi:Extension>
+			</ownedEnd>
+			<xmi:Extension extender="Visual Paradigm for UML">
+				<qualityScore value="100"/>
+			</xmi:Extension>
+		</ownedMember>
+		<ownedMember isAbstract="false" isDerived="false" isLeaf="false" xmi:id="ghXBHuyCiu1SNxMM" xmi:type="uml:Association">
+			<memberEnd xmi:idref="ghXBHuyCiu1SNxMN"/>
+			<ownedEnd aggregation="none" association="ghXBHuyCiu1SNxMM" isDerived="false" isNavigable="true" type="Oa6BHuyCiu1SNxLh" xmi:id="ghXBHuyCiu1SNxMN" xmi:type="uml:Property">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<associationEnd/>
+					<qualifier name="" xmi:id="ghXBHuyCiu1SNxMO" xmi:type="qualifier">
+						<xmi:Extension extender="Visual Paradigm for UML">
+							<qualityScore value="-1"/>
+						</xmi:Extension>
+					</qualifier>
+					<qualityScore value="-1"/>
+				</xmi:Extension>
+			</ownedEnd>
+			<memberEnd xmi:idref="QhXBHuyCiu1SNxMP"/>
+			<ownedEnd aggregation="none" association="ghXBHuyCiu1SNxMM" isDerived="false" isNavigable="true" type="Xw_ibuyCiu1SNxFK" xmi:id="QhXBHuyCiu1SNxMP" xmi:type="uml:Property">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<associationEnd/>
+					<qualifier name="" xmi:id="QhXBHuyCiu1SNxMQ" xmi:type="qualifier">
+						<xmi:Extension extender="Visual Paradigm for UML">
+							<qualityScore value="-1"/>
+						</xmi:Extension>
+					</qualifier>
+					<qualityScore value="-1"/>
+				</xmi:Extension>
+			</ownedEnd>
+			<xmi:Extension extender="Visual Paradigm for UML">
+				<qualityScore value="100"/>
+			</xmi:Extension>
+		</ownedMember>
+		<ownedMember isAbstract="false" isDerived="false" isLeaf="false" name="time" xmi:id="eWBu3uyCiu1SNxXO" xmi:type="uml:Association">
+			<memberEnd xmi:idref="eWBu3uyCiu1SNxXP"/>
+			<ownedEnd aggregation="none" association="eWBu3uyCiu1SNxXO" isDerived="false" type="tkL1WuyEwTiAAgcE" xmi:id="eWBu3uyCiu1SNxXP" xmi:type="uml:Property">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<associationEnd/>
+					<qualifier name="" xmi:id="eWBu3uyCiu1SNxXQ" xmi:type="qualifier">
+						<xmi:Extension extender="Visual Paradigm for UML">
+							<qualityScore value="-1"/>
+						</xmi:Extension>
+					</qualifier>
+					<qualityScore value="-1"/>
+				</xmi:Extension>
+			</ownedEnd>
+			<memberEnd xmi:idref="eWBu3uyCiu1SNxXR"/>
+			<ownedEnd aggregation="none" association="eWBu3uyCiu1SNxXO" isDerived="false" isNavigable="true" type="n0UGjuyCiu1SNwmv" xmi:id="eWBu3uyCiu1SNxXR" xmi:type="uml:Property">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<associationEnd/>
+					<qualifier name="" xmi:id="eWBu3uyCiu1SNxXS" xmi:type="qualifier">
+						<xmi:Extension extender="Visual Paradigm for UML">
+							<qualityScore value="-1"/>
+						</xmi:Extension>
+					</qualifier>
+					<qualityScore value="-1"/>
+				</xmi:Extension>
+			</ownedEnd>
+			<xmi:Extension extender="Visual Paradigm for UML">
+				<qualityScore value="97"/>
+				<qualityReason value="2&#9;2"/>
+			</xmi:Extension>
+		</ownedMember>
+		<ownedMember isAbstract="false" isDerived="false" isLeaf="false" name="wasInformedBy" xmi:id="1MC5_uyCiu1SNxbJ" xmi:type="uml:Association">
+			<memberEnd xmi:idref="1MC5_uyCiu1SNxbK"/>
+			<ownedEnd aggregation="none" association="1MC5_uyCiu1SNxbJ" isDerived="false" isNavigable="true" type="vTljmuyEwTiAAgLp" xmi:id="1MC5_uyCiu1SNxbK" xmi:type="uml:Property">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<associationEnd/>
+					<qualifier name="" xmi:id="1MC5_uyCiu1SNxbL" xmi:type="qualifier">
+						<xmi:Extension extender="Visual Paradigm for UML">
+							<qualityScore value="-1"/>
+						</xmi:Extension>
+					</qualifier>
+					<qualityScore value="-1"/>
+				</xmi:Extension>
+			</ownedEnd>
+			<memberEnd xmi:idref="1MC5_uyCiu1SNxbM"/>
+			<ownedEnd aggregation="none" association="1MC5_uyCiu1SNxbJ" isDerived="false" type="vTljmuyEwTiAAgLp" xmi:id="1MC5_uyCiu1SNxbM" xmi:type="uml:Property">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<associationEnd/>
+					<qualifier name="" xmi:id="1MC5_uyCiu1SNxbN" xmi:type="qualifier">
+						<xmi:Extension extender="Visual Paradigm for UML">
+							<qualityScore value="-1"/>
+						</xmi:Extension>
+					</qualifier>
+					<qualityScore value="-1"/>
+				</xmi:Extension>
+			</ownedEnd>
+			<xmi:Extension extender="Visual Paradigm for UML">
+				<qualityScore value="-1"/>
+			</xmi:Extension>
+		</ownedMember>
 	</uml:Model>
 	<uml:Diagram diagramType="ClassDiagram" documentation="" name="Component1" toolName="Visual Paradigm for UML" xmi:id="EUejmuyEwTiAAgLc">
 		<xmi:Extension extender="Visual Paradigm for UML">
 			<properties>
 				<apmAuthor value="lavm"/>
 				<apmCreateDateTime value="1337240969847"/>
-				<apmLastModified value="1337357128273"/>
+				<apmLastModified value="1337806254996"/>
 				<ashowPackageNameStyle value="0"/>
 				<ashowConnectorName value="0"/>
 				<apaintConnectorThroughLabel value="0"/>
@@ -7015,7 +8231,7 @@
 				<ashowTaggedValues value="false"/>
 				<ashowStereotypes value="true"/>
 				<ashowConstraints value="false"/>
-				<aalignToGrid value="true"/>
+				<aalignToGrid value="false"/>
 				<agridVisible value="false"/>
 				<agridWidth value="10"/>
 				<agridHeight value="10"/>
@@ -7028,11 +8244,11 @@
 				<aconnectorLabelOrientation value="0"/>
 				<amodelElementNameAlignment value="4"/>
 				<azoomRatio value="1.0"/>
-				<amaximized value="false"/>
+				<amaximized value="true"/>
 				<ax value="0"/>
 				<ay value="0"/>
 				<awidth value="1235"/>
-				<aheight value="603"/>
+				<aheight value="653"/>
 				<aqualityScore value="-1"/>
 				<aparentModel value="g7h.WuyEwTiAAgZK"/>
 				<a_globalPaletteOption value="true"/>
@@ -7058,137 +8274,7 @@
 			</properties>
 		</xmi:Extension>
 		<uml:Diagram.element>
-			<uml:DiagramElement geometry="70,170,80,130" preferredShapeType="Class" subject="m6xjmuyEwTiAAgLk" xmi:id="OaxjmuyEwTiAAgLj">
-				<xmi:Extension extender="Visual Paradigm for UML">
-					<captionBounds value="0,0,80,14"/>
-					<captionInternalWidth value="-2147483648"/>
-					<captionInternalHeight value="-2147483648"/>
-					<captionVisible value="true"/>
-					<captionSide value="12"/>
-					<properties>
-						<abackground value="Cr:122,207,245,255"/>
-						<aforeground value="Cr:0,0,0,255"/>
-						<azOrder value="20"/>
-						<acreatorDiagramType value="ClassDiagram"/>
-						<aselectable value="true"/>
-						<arequestResetCaption value="false"/>
-						<arequestResetCaptionSize value="false"/>
-						<adisplayStereotypeIcon value="false"/>
-						<aoverrideAppearanceWithStereotypeIcon value="true"/>
-						<arequestSetSizeOption value="0"/>
-						<aparentConnectorHeaderLength value="40"/>
-						<aparentConnectorLineLength value="10"/>
-						<aconnectToPoint value="true"/>
-						<aparentConnectorDTheta value="0.0"/>
-						<aconnectionPointType value="2"/>
-						<amodelElementNameAlignment value="9"/>
-						<arequestDefaultSize value="false"/>
-						<arequestFitSize value="false"/>
-						<arequestFitSizeFromCenter value="false"/>
-						<adisplayAsRobustnessAnalysisIcon value="true"/>
-						<avisibilityStyle value="1"/>
-						<ashowAttributeType value="1"/>
-						<ashowOperationType value="1"/>
-						<amSwTpPts value="true"/>
-						<alshRfAts value="true"/>
-						<amShDrAt value="false"/>
-						<akShDrOp value="false"/>
-						<akSwCsMbSt value="true"/>
-						<ashowClassMemberConstraints value="true"/>
-						<alShCmMl value="false"/>
-						<ashowOperationParameterDirection value="false"/>
-						<ashowOperationRaisedExceptions value="false"/>
-						<ashowParameterNameInOperationSignature value="true"/>
-						<ashowOperationTemplateParameters value="false"/>
-						<ashowOperationProperties value="false"/>
-						<awpMbs value="false"/>
-						<aattributeSortType value="0"/>
-						<aoperationSortType value="0"/>
-						<ashowInitialAttributeValue value="true"/>
-						<ashowOperationSignature value="true"/>
-						<ainterfaceBall value="false"/>
-						<ashowEmptyCompartments value="0"/>
-						<ashowEllipsisForUnshownMembers value="0"/>
-						<ashowAttributesCodeDetails value="0"/>
-						<ashowOperationsCodeDetails value="0"/>
-						<ashowParametersCodeDetails value="0"/>
-						<ashowTypeOption value="0"/>
-						<ashowOwnerOption value="3"/>
-						<ashowAttributesType value="0"/>
-						<ashowOperationsParameters value="0"/>
-						<ashowOperationsReturnType value="0"/>
-					</properties>
-				</xmi:Extension>
-				<elementFill color1="Cr:122,207,245,255" color2="" style="1" transparency="0" type="1"/>
-				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
-				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
-			</uml:DiagramElement>
-			<uml:DiagramElement geometry="550,170,80,120" preferredShapeType="Class" subject="vTljmuyEwTiAAgLp" xmi:id="PTljmuyEwTiAAgLo">
-				<xmi:Extension extender="Visual Paradigm for UML">
-					<captionBounds value="0,0,80,14"/>
-					<captionInternalWidth value="-2147483648"/>
-					<captionInternalHeight value="-2147483648"/>
-					<captionVisible value="true"/>
-					<captionSide value="12"/>
-					<properties>
-						<abackground value="Cr:122,207,245,255"/>
-						<aforeground value="Cr:0,0,0,255"/>
-						<azOrder value="18"/>
-						<acreatorDiagramType value="ClassDiagram"/>
-						<aselectable value="true"/>
-						<arequestResetCaption value="false"/>
-						<arequestResetCaptionSize value="false"/>
-						<adisplayStereotypeIcon value="false"/>
-						<aoverrideAppearanceWithStereotypeIcon value="true"/>
-						<arequestSetSizeOption value="0"/>
-						<aparentConnectorHeaderLength value="40"/>
-						<aparentConnectorLineLength value="10"/>
-						<aconnectToPoint value="true"/>
-						<aparentConnectorDTheta value="0.0"/>
-						<aconnectionPointType value="2"/>
-						<amodelElementNameAlignment value="9"/>
-						<arequestDefaultSize value="false"/>
-						<arequestFitSize value="false"/>
-						<arequestFitSizeFromCenter value="false"/>
-						<adisplayAsRobustnessAnalysisIcon value="true"/>
-						<avisibilityStyle value="1"/>
-						<ashowAttributeType value="1"/>
-						<ashowOperationType value="1"/>
-						<amSwTpPts value="true"/>
-						<alshRfAts value="true"/>
-						<amShDrAt value="false"/>
-						<akShDrOp value="false"/>
-						<akSwCsMbSt value="true"/>
-						<ashowClassMemberConstraints value="true"/>
-						<alShCmMl value="false"/>
-						<ashowOperationParameterDirection value="false"/>
-						<ashowOperationRaisedExceptions value="false"/>
-						<ashowParameterNameInOperationSignature value="true"/>
-						<ashowOperationTemplateParameters value="false"/>
-						<ashowOperationProperties value="false"/>
-						<awpMbs value="false"/>
-						<aattributeSortType value="0"/>
-						<aoperationSortType value="0"/>
-						<ashowInitialAttributeValue value="true"/>
-						<ashowOperationSignature value="true"/>
-						<ainterfaceBall value="false"/>
-						<ashowEmptyCompartments value="0"/>
-						<ashowEllipsisForUnshownMembers value="0"/>
-						<ashowAttributesCodeDetails value="0"/>
-						<ashowOperationsCodeDetails value="0"/>
-						<ashowParametersCodeDetails value="0"/>
-						<ashowTypeOption value="0"/>
-						<ashowOwnerOption value="3"/>
-						<ashowAttributesType value="0"/>
-						<ashowOperationsParameters value="0"/>
-						<ashowOperationsReturnType value="0"/>
-					</properties>
-				</xmi:Extension>
-				<elementFill color1="Cr:122,207,245,255" color2="" style="1" transparency="0" type="1"/>
-				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
-				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
-			</uml:DiagramElement>
-			<uml:DiagramElement geometry="270,30,100,64" preferredShapeType="Class" subject="_i1UWuyEwTiAAgSK" xmi:id="jNW0WuyEwTiAAgS4">
+			<uml:DiagramElement geometry="260,540,100,60" preferredShapeType="Class" subject="_i1UWuyEwTiAAgSK" xmi:id="jNW0WuyEwTiAAgS4">
 				<xmi:Extension extender="Visual Paradigm for UML">
 					<captionBounds value="0,0,100,14"/>
 					<captionInternalWidth value="-2147483648"/>
@@ -7198,7 +8284,7 @@
 					<properties>
 						<abackground value="Cr:192,192,192,255"/>
 						<aforeground value="Cr:0,0,0,255"/>
-						<azOrder value="16"/>
+						<azOrder value="24"/>
 						<aselectable value="true"/>
 						<arequestResetCaption value="false"/>
 						<arequestResetCaptionSize value="false"/>
@@ -7252,366 +8338,7 @@
 				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
 				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
 			</uml:DiagramElement>
-			<uml:DiagramElement geometry="560,169;560,130;110,130;110,169;" preferredShapeType="Association" subject="f1p0WuyEwTiAAgTE" xmi:id="_1p0WuyEwTiAAgTJ">
-				<xmi:Extension extender="Visual Paradigm for UML">
-					<captionBounds value="250,110,86,14"/>
-					<captionInternalWidth value="-2147483648"/>
-					<captionInternalHeight value="-2147483648"/>
-					<captionVisible value="true"/>
-					<captionSide value="1"/>
-					<roleB roleName="80,110,56,14"/>
-					<properties>
-						<abackground value="Cr:122,207,245,255"/>
-						<aforeground value="Cr:0,0,0,255"/>
-						<azOrder value="-1"/>
-						<acreatorDiagramType value="ClassDiagram"/>
-						<aselectable value="true"/>
-						<arequestResetCaption value="false"/>
-						<arequestResetCaptionSize value="false"/>
-						<aconnectorStyle value="3"/>
-						<aconnectorLineJumps value="4"/>
-						<aconnectorLabelOrientation value="4"/>
-						<afromShapeXDiff value="0"/>
-						<afromShapeYDiff value="0"/>
-						<atoShapeXDiff value="0"/>
-						<atoShapeYDiff value="0"/>
-						<afromConnectType value="0"/>
-						<atoConnectType value="0"/>
-						<auseFromShapeCenter value="true"/>
-						<auseToShapeCenter value="true"/>
-						<afromPinType value="1"/>
-						<atoPinType value="1"/>
-						<arequestRebuild value="false"/>
-						<ashowConnectorName value="2"/>
-						<apaintThroughLabel value="2"/>
-						<ahasRoleAShape value="false"/>
-						<ahasRoleBShape value="true"/>
-						<ashowMultiplicityConstraints value="false"/>
-						<aroleBRectangle value="Re:80.0,110.0,56.0,14.0"/>
-						<ahasMultiplicityAShape value="false"/>
-						<ahasMultiplicityBShape value="false"/>
-						<a0SwDr value="false"/>
-						<ashowStereotypes value="true"/>
-						<ashowFromRoleName value="true"/>
-						<ashowToRoleName value="true"/>
-						<ashowFromMultiplicity value="true"/>
-						<ashowToMultiplicity value="true"/>
-						<ashowFromRoleVisibility value="true"/>
-						<ashowToRoleVisibility value="true"/>
-						<ashowAssociationEndPropertyStrings value="false"/>
-						<ahasAssociationEndPropertyStringsAShape value="false"/>
-						<ahasAssociationEndPropertyStringsBShape value="false"/>
-						<afromRoleInternalWidth value="-2147483648"/>
-						<afromRoleInternalHeight value="-2147483648"/>
-						<atoRoleInternalWidth value="-2147483648"/>
-						<atoRoleInternalHeight value="-2147483648"/>
-						<afromMultiplicityInternalWidth value="-2147483648"/>
-						<afromMultiplicityInternalHeight value="-2147483648"/>
-						<atoMultiplicityInternalWidth value="-2147483648"/>
-						<atoMultiplicityInternalHeight value="-2147483648"/>
-						<aassociationEndPropertyStringsAInternalWidth value="-2147483648"/>
-						<aassociationEndPropertyStringsAInternalHeight value="-2147483648"/>
-						<aassociationEndPropertyStringsBInternalWidth value="-2147483648"/>
-						<aassociationEndPropertyStringsBInternalHeight value="-2147483648"/>
-					</properties>
-				</xmi:Extension>
-				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
-				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
-			</uml:DiagramElement>
-			<uml:DiagramElement geometry="340,130;340,94;" preferredShapeType="AssociationClass" subject="9G50WuyEwTiAAgTM" xmi:id="9G50WuyEwTiAAgTN">
-				<xmi:Extension extender="Visual Paradigm for UML">
-					<captionBounds value="350,123,20,0"/>
-					<captionInternalWidth value="-2147483648"/>
-					<captionInternalHeight value="-2147483648"/>
-					<captionVisible value="true"/>
-					<captionSide value="1"/>
-					<properties>
-						<abackground value="Cr:122,207,245,255"/>
-						<aforeground value="Cr:0,0,0,255"/>
-						<azOrder value="-1"/>
-						<aselectable value="true"/>
-						<arequestResetCaption value="false"/>
-						<arequestResetCaptionSize value="false"/>
-						<aconnectorStyle value="3"/>
-						<aconnectorLineJumps value="4"/>
-						<aconnectorLabelOrientation value="4"/>
-						<afromShapeXDiff value="0"/>
-						<afromShapeYDiff value="0"/>
-						<atoShapeXDiff value="0"/>
-						<atoShapeYDiff value="0"/>
-						<afromConnectType value="0"/>
-						<atoConnectType value="0"/>
-						<auseFromShapeCenter value="true"/>
-						<auseToShapeCenter value="true"/>
-						<afromPinType value="1"/>
-						<atoPinType value="1"/>
-						<arequestRebuild value="false"/>
-						<ashowConnectorName value="2"/>
-						<apaintThroughLabel value="2"/>
-					</properties>
-				</xmi:Extension>
-				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
-				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
-			</uml:DiagramElement>
-			<uml:DiagramElement geometry="549,230;150,230;" preferredShapeType="Association" subject="WzlMWuyEwTiAAgT6" xmi:id="2zlMWuyEwTiAAgT_">
-				<xmi:Extension extender="Visual Paradigm for UML">
-					<captionBounds value="310,210,108,14"/>
-					<captionInternalWidth value="-2147483648"/>
-					<captionInternalHeight value="-2147483648"/>
-					<captionVisible value="true"/>
-					<captionSide value="1"/>
-					<properties>
-						<abackground value="Cr:122,207,245,255"/>
-						<aforeground value="Cr:0,0,0,255"/>
-						<azOrder value="-1"/>
-						<acreatorDiagramType value="ClassDiagram"/>
-						<aselectable value="true"/>
-						<arequestResetCaption value="false"/>
-						<arequestResetCaptionSize value="false"/>
-						<aconnectorStyle value="3"/>
-						<aconnectorLineJumps value="4"/>
-						<aconnectorLabelOrientation value="4"/>
-						<afromShapeXDiff value="0"/>
-						<afromShapeYDiff value="0"/>
-						<atoShapeXDiff value="0"/>
-						<atoShapeYDiff value="0"/>
-						<afromConnectType value="0"/>
-						<atoConnectType value="0"/>
-						<auseFromShapeCenter value="true"/>
-						<auseToShapeCenter value="true"/>
-						<afromPinType value="1"/>
-						<atoPinType value="1"/>
-						<arequestRebuild value="false"/>
-						<ashowConnectorName value="2"/>
-						<apaintThroughLabel value="2"/>
-						<ahasRoleAShape value="false"/>
-						<ahasRoleBShape value="false"/>
-						<ashowMultiplicityConstraints value="false"/>
-						<ahasMultiplicityAShape value="false"/>
-						<ahasMultiplicityBShape value="false"/>
-						<a0SwDr value="false"/>
-						<ashowStereotypes value="true"/>
-						<ashowFromRoleName value="true"/>
-						<ashowToRoleName value="true"/>
-						<ashowFromMultiplicity value="true"/>
-						<ashowToMultiplicity value="true"/>
-						<ashowFromRoleVisibility value="true"/>
-						<ashowToRoleVisibility value="true"/>
-						<ashowAssociationEndPropertyStrings value="false"/>
-						<ahasAssociationEndPropertyStringsAShape value="false"/>
-						<ahasAssociationEndPropertyStringsBShape value="false"/>
-						<afromRoleInternalWidth value="-2147483648"/>
-						<afromRoleInternalHeight value="-2147483648"/>
-						<atoRoleInternalWidth value="-2147483648"/>
-						<atoRoleInternalHeight value="-2147483648"/>
-						<afromMultiplicityInternalWidth value="-2147483648"/>
-						<afromMultiplicityInternalHeight value="-2147483648"/>
-						<atoMultiplicityInternalWidth value="-2147483648"/>
-						<atoMultiplicityInternalHeight value="-2147483648"/>
-						<aassociationEndPropertyStringsAInternalWidth value="-2147483648"/>
-						<aassociationEndPropertyStringsAInternalHeight value="-2147483648"/>
-						<aassociationEndPropertyStringsBInternalWidth value="-2147483648"/>
-						<aassociationEndPropertyStringsBInternalHeight value="-2147483648"/>
-					</properties>
-				</xmi:Extension>
-				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
-				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
-			</uml:DiagramElement>
-			<uml:DiagramElement geometry="150,270;549,270;" preferredShapeType="Association" subject="JsssWuyEwTiAAgU5" xmi:id="psssWuyEwTiAAgU.">
-				<xmi:Extension extender="Visual Paradigm for UML">
-					<captionBounds value="310,250,112,14"/>
-					<captionInternalWidth value="-2147483648"/>
-					<captionInternalHeight value="-2147483648"/>
-					<captionVisible value="true"/>
-					<captionSide value="1"/>
-					<properties>
-						<abackground value="Cr:122,207,245,255"/>
-						<aforeground value="Cr:0,0,0,255"/>
-						<azOrder value="-1"/>
-						<acreatorDiagramType value="ClassDiagram"/>
-						<aselectable value="true"/>
-						<arequestResetCaption value="false"/>
-						<arequestResetCaptionSize value="false"/>
-						<aconnectorStyle value="3"/>
-						<aconnectorLineJumps value="4"/>
-						<aconnectorLabelOrientation value="4"/>
-						<afromShapeXDiff value="0"/>
-						<afromShapeYDiff value="0"/>
-						<atoShapeXDiff value="0"/>
-						<atoShapeYDiff value="0"/>
-						<afromConnectType value="0"/>
-						<atoConnectType value="0"/>
-						<auseFromShapeCenter value="true"/>
-						<auseToShapeCenter value="true"/>
-						<afromPinType value="1"/>
-						<atoPinType value="1"/>
-						<arequestRebuild value="false"/>
-						<ashowConnectorName value="2"/>
-						<apaintThroughLabel value="2"/>
-						<ahasRoleAShape value="false"/>
-						<ahasRoleBShape value="false"/>
-						<ashowMultiplicityConstraints value="false"/>
-						<aroleBRectangle value="Re:520.0,260.0,26.0,14.0"/>
-						<amultiplicityBRectangle value="Re:480.0,210.0,42.0,14.0"/>
-						<ahasMultiplicityAShape value="false"/>
-						<ahasMultiplicityBShape value="false"/>
-						<a0SwDr value="false"/>
-						<ashowStereotypes value="true"/>
-						<ashowFromRoleName value="true"/>
-						<ashowToRoleName value="true"/>
-						<ashowFromMultiplicity value="true"/>
-						<ashowToMultiplicity value="true"/>
-						<ashowFromRoleVisibility value="true"/>
-						<ashowToRoleVisibility value="true"/>
-						<ashowAssociationEndPropertyStrings value="false"/>
-						<ahasAssociationEndPropertyStringsAShape value="false"/>
-						<ahasAssociationEndPropertyStringsBShape value="false"/>
-						<afromRoleInternalWidth value="-2147483648"/>
-						<afromRoleInternalHeight value="-2147483648"/>
-						<atoRoleInternalWidth value="-2147483648"/>
-						<atoRoleInternalHeight value="-2147483648"/>
-						<afromMultiplicityInternalWidth value="-2147483648"/>
-						<afromMultiplicityInternalHeight value="-2147483648"/>
-						<atoMultiplicityInternalWidth value="-2147483648"/>
-						<atoMultiplicityInternalHeight value="-2147483648"/>
-						<aassociationEndPropertyStringsAInternalWidth value="-2147483648"/>
-						<aassociationEndPropertyStringsAInternalHeight value="-2147483648"/>
-						<aassociationEndPropertyStringsBInternalWidth value="-2147483648"/>
-						<aassociationEndPropertyStringsBInternalHeight value="-2147483648"/>
-					</properties>
-				</xmi:Extension>
-				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
-				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
-			</uml:DiagramElement>
-			<uml:DiagramElement geometry="549,190;150,190;" preferredShapeType="Association" subject="oXsuWuyEwTiAAgWq" xmi:id="YXsuWuyEwTiAAgWv">
-				<xmi:Extension extender="Visual Paradigm for UML">
-					<captionBounds value="310,170,46,14"/>
-					<captionInternalWidth value="-2147483648"/>
-					<captionInternalHeight value="-2147483648"/>
-					<captionVisible value="true"/>
-					<captionSide value="1"/>
-					<properties>
-						<abackground value="Cr:122,207,245,255"/>
-						<aforeground value="Cr:0,0,0,255"/>
-						<azOrder value="-1"/>
-						<acreatorDiagramType value="ClassDiagram"/>
-						<aselectable value="true"/>
-						<arequestResetCaption value="false"/>
-						<arequestResetCaptionSize value="false"/>
-						<aconnectorStyle value="3"/>
-						<aconnectorLineJumps value="4"/>
-						<aconnectorLabelOrientation value="4"/>
-						<afromShapeXDiff value="0"/>
-						<afromShapeYDiff value="0"/>
-						<atoShapeXDiff value="0"/>
-						<atoShapeYDiff value="0"/>
-						<afromConnectType value="0"/>
-						<atoConnectType value="0"/>
-						<auseFromShapeCenter value="true"/>
-						<auseToShapeCenter value="true"/>
-						<afromPinType value="1"/>
-						<atoPinType value="1"/>
-						<arequestRebuild value="false"/>
-						<ashowConnectorName value="2"/>
-						<apaintThroughLabel value="2"/>
-						<ahasRoleAShape value="false"/>
-						<ahasRoleBShape value="false"/>
-						<ashowMultiplicityConstraints value="false"/>
-						<ahasMultiplicityAShape value="false"/>
-						<ahasMultiplicityBShape value="false"/>
-						<a0SwDr value="false"/>
-						<ashowStereotypes value="true"/>
-						<ashowFromRoleName value="true"/>
-						<ashowToRoleName value="true"/>
-						<ashowFromMultiplicity value="true"/>
-						<ashowToMultiplicity value="true"/>
-						<ashowFromRoleVisibility value="true"/>
-						<ashowToRoleVisibility value="true"/>
-						<ashowAssociationEndPropertyStrings value="false"/>
-						<ahasAssociationEndPropertyStringsAShape value="false"/>
-						<ahasAssociationEndPropertyStringsBShape value="false"/>
-						<afromRoleInternalWidth value="-2147483648"/>
-						<afromRoleInternalHeight value="-2147483648"/>
-						<atoRoleInternalWidth value="-2147483648"/>
-						<atoRoleInternalHeight value="-2147483648"/>
-						<afromMultiplicityInternalWidth value="-2147483648"/>
-						<afromMultiplicityInternalHeight value="-2147483648"/>
-						<atoMultiplicityInternalWidth value="-2147483648"/>
-						<atoMultiplicityInternalHeight value="-2147483648"/>
-						<aassociationEndPropertyStringsAInternalWidth value="-2147483648"/>
-						<aassociationEndPropertyStringsAInternalHeight value="-2147483648"/>
-						<aassociationEndPropertyStringsBInternalWidth value="-2147483648"/>
-						<aassociationEndPropertyStringsBInternalHeight value="-2147483648"/>
-					</properties>
-				</xmi:Extension>
-				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
-				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
-			</uml:DiagramElement>
-			<uml:DiagramElement geometry="370,70;580,70;580,169;" preferredShapeType="Association" subject="qsAeWuyEwTiAAgXg" xmi:id="qsAeWuyEwTiAAgXl">
-				<xmi:Extension extender="Visual Paradigm for UML">
-					<captionBounds value="510,50,51,14"/>
-					<captionInternalWidth value="-2147483648"/>
-					<captionInternalHeight value="-2147483648"/>
-					<captionVisible value="true"/>
-					<captionSide value="1"/>
-					<properties>
-						<abackground value="Cr:122,207,245,255"/>
-						<aforeground value="Cr:0,0,0,255"/>
-						<azOrder value="-1"/>
-						<acreatorDiagramType value="ClassDiagram"/>
-						<aselectable value="true"/>
-						<arequestResetCaption value="false"/>
-						<arequestResetCaptionSize value="false"/>
-						<aconnectorStyle value="3"/>
-						<aconnectorLineJumps value="4"/>
-						<aconnectorLabelOrientation value="4"/>
-						<afromShapeXDiff value="0"/>
-						<afromShapeYDiff value="0"/>
-						<atoShapeXDiff value="0"/>
-						<atoShapeYDiff value="0"/>
-						<afromConnectType value="0"/>
-						<atoConnectType value="0"/>
-						<auseFromShapeCenter value="true"/>
-						<auseToShapeCenter value="true"/>
-						<afromPinType value="1"/>
-						<atoPinType value="1"/>
-						<arequestRebuild value="false"/>
-						<ashowConnectorName value="2"/>
-						<apaintThroughLabel value="2"/>
-						<ahasRoleAShape value="false"/>
-						<ahasRoleBShape value="false"/>
-						<ashowMultiplicityConstraints value="false"/>
-						<ahasMultiplicityAShape value="false"/>
-						<ahasMultiplicityBShape value="false"/>
-						<a0SwDr value="false"/>
-						<ashowStereotypes value="true"/>
-						<ashowFromRoleName value="true"/>
-						<ashowToRoleName value="true"/>
-						<ashowFromMultiplicity value="true"/>
-						<ashowToMultiplicity value="true"/>
-						<ashowFromRoleVisibility value="true"/>
-						<ashowToRoleVisibility value="true"/>
-						<ashowAssociationEndPropertyStrings value="false"/>
-						<ahasAssociationEndPropertyStringsAShape value="false"/>
-						<ahasAssociationEndPropertyStringsBShape value="false"/>
-						<afromRoleInternalWidth value="-2147483648"/>
-						<afromRoleInternalHeight value="-2147483648"/>
-						<atoRoleInternalWidth value="-2147483648"/>
-						<atoRoleInternalHeight value="-2147483648"/>
-						<afromMultiplicityInternalWidth value="-2147483648"/>
-						<afromMultiplicityInternalHeight value="-2147483648"/>
-						<atoMultiplicityInternalWidth value="-2147483648"/>
-						<atoMultiplicityInternalHeight value="-2147483648"/>
-						<aassociationEndPropertyStringsAInternalWidth value="-2147483648"/>
-						<aassociationEndPropertyStringsAInternalHeight value="-2147483648"/>
-						<aassociationEndPropertyStringsBInternalWidth value="-2147483648"/>
-						<aassociationEndPropertyStringsBInternalHeight value="-2147483648"/>
-					</properties>
-				</xmi:Extension>
-				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
-				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
-			</uml:DiagramElement>
-			<uml:DiagramElement geometry="270,440,100,64" preferredShapeType="Class" subject="LvBeWuyEwTiAAgYC" xmi:id="LvBeWuyEwTiAAgYB">
+			<uml:DiagramElement geometry="390,540,100,60" preferredShapeType="Class" subject="LvBeWuyEwTiAAgYC" xmi:id="LvBeWuyEwTiAAgYB">
 				<xmi:Extension extender="Visual Paradigm for UML">
 					<captionBounds value="0,0,100,14"/>
 					<captionInternalWidth value="-2147483648"/>
@@ -7621,6 +8348,201 @@
 					<properties>
 						<abackground value="Cr:192,192,192,255"/>
 						<aforeground value="Cr:0,0,0,255"/>
+						<azOrder value="20"/>
+						<acreatorDiagramType value="ClassDiagram"/>
+						<aselectable value="true"/>
+						<arequestResetCaption value="false"/>
+						<arequestResetCaptionSize value="false"/>
+						<adisplayStereotypeIcon value="false"/>
+						<aoverrideAppearanceWithStereotypeIcon value="true"/>
+						<arequestSetSizeOption value="0"/>
+						<aparentConnectorHeaderLength value="40"/>
+						<aparentConnectorLineLength value="10"/>
+						<aconnectToPoint value="true"/>
+						<aparentConnectorDTheta value="0.0"/>
+						<aconnectionPointType value="2"/>
+						<amodelElementNameAlignment value="9"/>
+						<arequestDefaultSize value="false"/>
+						<arequestFitSize value="false"/>
+						<arequestFitSizeFromCenter value="false"/>
+						<adisplayAsRobustnessAnalysisIcon value="true"/>
+						<avisibilityStyle value="1"/>
+						<ashowAttributeType value="1"/>
+						<ashowOperationType value="1"/>
+						<amSwTpPts value="true"/>
+						<alshRfAts value="true"/>
+						<amShDrAt value="false"/>
+						<akShDrOp value="false"/>
+						<akSwCsMbSt value="true"/>
+						<ashowClassMemberConstraints value="true"/>
+						<alShCmMl value="false"/>
+						<ashowOperationParameterDirection value="false"/>
+						<ashowOperationRaisedExceptions value="false"/>
+						<ashowParameterNameInOperationSignature value="true"/>
+						<ashowOperationTemplateParameters value="false"/>
+						<ashowOperationProperties value="false"/>
+						<awpMbs value="false"/>
+						<aattributeSortType value="0"/>
+						<aoperationSortType value="0"/>
+						<ashowInitialAttributeValue value="true"/>
+						<ashowOperationSignature value="true"/>
+						<ainterfaceBall value="false"/>
+						<ashowEmptyCompartments value="0"/>
+						<ashowEllipsisForUnshownMembers value="0"/>
+						<ashowAttributesCodeDetails value="0"/>
+						<ashowOperationsCodeDetails value="0"/>
+						<ashowParametersCodeDetails value="0"/>
+						<ashowTypeOption value="0"/>
+						<ashowOwnerOption value="3"/>
+						<ashowAttributesType value="0"/>
+						<ashowOperationsParameters value="0"/>
+						<ashowOperationsReturnType value="0"/>
+					</properties>
+				</xmi:Extension>
+				<elementFill color1="Cr:192,192,192,255" color2="" style="1" transparency="0" type="1"/>
+				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
+				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
+			</uml:DiagramElement>
+			<uml:DiagramElement geometry="180,330,80,60" preferredShapeType="Class" subject="tkL1WuyEwTiAAgcE" xmi:id="tkL1WuyEwTiAAgcD">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<captionBounds value="0,0,80,14"/>
+					<captionInternalWidth value="-2147483648"/>
+					<captionInternalHeight value="-2147483648"/>
+					<captionVisible value="true"/>
+					<captionSide value="12"/>
+					<properties>
+						<abackground value="Cr:192,192,192,255"/>
+						<aforeground value="Cr:0,0,0,255"/>
+						<azOrder value="18"/>
+						<acreatorDiagramType value="ClassDiagram"/>
+						<aselectable value="true"/>
+						<arequestResetCaption value="false"/>
+						<arequestResetCaptionSize value="false"/>
+						<adisplayStereotypeIcon value="false"/>
+						<aoverrideAppearanceWithStereotypeIcon value="true"/>
+						<arequestSetSizeOption value="0"/>
+						<aparentConnectorHeaderLength value="40"/>
+						<aparentConnectorLineLength value="10"/>
+						<aconnectToPoint value="true"/>
+						<aparentConnectorDTheta value="0.0"/>
+						<aconnectionPointType value="2"/>
+						<amodelElementNameAlignment value="9"/>
+						<arequestDefaultSize value="false"/>
+						<arequestFitSize value="false"/>
+						<arequestFitSizeFromCenter value="false"/>
+						<adisplayAsRobustnessAnalysisIcon value="true"/>
+						<avisibilityStyle value="1"/>
+						<ashowAttributeType value="1"/>
+						<ashowOperationType value="1"/>
+						<amSwTpPts value="true"/>
+						<alshRfAts value="true"/>
+						<amShDrAt value="false"/>
+						<akShDrOp value="false"/>
+						<akSwCsMbSt value="true"/>
+						<ashowClassMemberConstraints value="true"/>
+						<alShCmMl value="false"/>
+						<ashowOperationParameterDirection value="false"/>
+						<ashowOperationRaisedExceptions value="false"/>
+						<ashowParameterNameInOperationSignature value="true"/>
+						<ashowOperationTemplateParameters value="false"/>
+						<ashowOperationProperties value="false"/>
+						<awpMbs value="false"/>
+						<aattributeSortType value="0"/>
+						<aoperationSortType value="0"/>
+						<ashowInitialAttributeValue value="true"/>
+						<ashowOperationSignature value="true"/>
+						<ainterfaceBall value="false"/>
+						<ashowEmptyCompartments value="0"/>
+						<ashowEllipsisForUnshownMembers value="0"/>
+						<ashowAttributesCodeDetails value="0"/>
+						<ashowOperationsCodeDetails value="0"/>
+						<ashowParametersCodeDetails value="0"/>
+						<ashowTypeOption value="0"/>
+						<ashowOwnerOption value="3"/>
+						<ashowAttributesType value="0"/>
+						<ashowOperationsParameters value="0"/>
+						<ashowOperationsReturnType value="0"/>
+					</properties>
+				</xmi:Extension>
+				<elementFill color1="Cr:192,192,192,255" color2="" style="1" transparency="0" type="1"/>
+				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
+				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
+			</uml:DiagramElement>
+			<uml:DiagramElement geometry="310,330,120,60" preferredShapeType="Class" subject="9un1WuyEwTiAAgcK" xmi:id="9un1WuyEwTiAAgcJ">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<captionBounds value="0,0,120,14"/>
+					<captionInternalWidth value="-2147483648"/>
+					<captionInternalHeight value="-2147483648"/>
+					<captionVisible value="true"/>
+					<captionSide value="12"/>
+					<properties>
+						<abackground value="Cr:192,192,192,255"/>
+						<aforeground value="Cr:0,0,0,255"/>
+						<azOrder value="16"/>
+						<acreatorDiagramType value="ClassDiagram"/>
+						<aselectable value="true"/>
+						<arequestResetCaption value="false"/>
+						<arequestResetCaptionSize value="false"/>
+						<adisplayStereotypeIcon value="false"/>
+						<aoverrideAppearanceWithStereotypeIcon value="true"/>
+						<arequestSetSizeOption value="0"/>
+						<aparentConnectorHeaderLength value="40"/>
+						<aparentConnectorLineLength value="10"/>
+						<aconnectToPoint value="true"/>
+						<aparentConnectorDTheta value="0.0"/>
+						<aconnectionPointType value="2"/>
+						<amodelElementNameAlignment value="9"/>
+						<arequestDefaultSize value="false"/>
+						<arequestFitSize value="false"/>
+						<arequestFitSizeFromCenter value="false"/>
+						<adisplayAsRobustnessAnalysisIcon value="true"/>
+						<avisibilityStyle value="1"/>
+						<ashowAttributeType value="1"/>
+						<ashowOperationType value="1"/>
+						<amSwTpPts value="true"/>
+						<alshRfAts value="true"/>
+						<amShDrAt value="false"/>
+						<akShDrOp value="false"/>
+						<akSwCsMbSt value="true"/>
+						<ashowClassMemberConstraints value="true"/>
+						<alShCmMl value="false"/>
+						<ashowOperationParameterDirection value="false"/>
+						<ashowOperationRaisedExceptions value="false"/>
+						<ashowParameterNameInOperationSignature value="true"/>
+						<ashowOperationTemplateParameters value="false"/>
+						<ashowOperationProperties value="false"/>
+						<awpMbs value="false"/>
+						<aattributeSortType value="0"/>
+						<aoperationSortType value="0"/>
+						<ashowInitialAttributeValue value="true"/>
+						<ashowOperationSignature value="true"/>
+						<ainterfaceBall value="false"/>
+						<ashowEmptyCompartments value="0"/>
+						<ashowEllipsisForUnshownMembers value="0"/>
+						<ashowAttributesCodeDetails value="0"/>
+						<ashowOperationsCodeDetails value="0"/>
+						<ashowParametersCodeDetails value="0"/>
+						<ashowTypeOption value="0"/>
+						<ashowOwnerOption value="3"/>
+						<ashowAttributesType value="0"/>
+						<ashowOperationsParameters value="0"/>
+						<ashowOperationsReturnType value="0"/>
+					</properties>
+				</xmi:Extension>
+				<elementFill color1="Cr:192,192,192,255" color2="" style="1" transparency="0" type="1"/>
+				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
+				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
+			</uml:DiagramElement>
+			<uml:DiagramElement geometry="470,330,120,60" preferredShapeType="Class" subject="q8f1WuyEwTiAAgcQ" xmi:id="q8f1WuyEwTiAAgcP">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<captionBounds value="0,0,120,14"/>
+					<captionInternalWidth value="-2147483648"/>
+					<captionInternalHeight value="-2147483648"/>
+					<captionVisible value="true"/>
+					<captionSide value="12"/>
+					<properties>
+						<abackground value="Cr:192,192,192,255"/>
+						<aforeground value="Cr:0,0,0,255"/>
 						<azOrder value="14"/>
 						<acreatorDiagramType value="ClassDiagram"/>
 						<aselectable value="true"/>
@@ -7676,176 +8598,9 @@
 				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
 				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
 			</uml:DiagramElement>
-			<uml:DiagramElement geometry="560,290;560,400;110,400;110,300;" preferredShapeType="Association" subject="wuw.WuyEwTiAAgYY" xmi:id="wuw.WuyEwTiAAgYd">
-				<xmi:Extension extender="Visual Paradigm for UML">
-					<captionBounds value="230,410,90,14"/>
-					<captionInternalWidth value="-2147483648"/>
-					<captionInternalHeight value="-2147483648"/>
-					<captionVisible value="true"/>
-					<captionSide value="1"/>
-					<roleB roleName="60,310,56,14"/>
-					<properties>
-						<abackground value="Cr:122,207,245,255"/>
-						<aforeground value="Cr:0,0,0,255"/>
-						<azOrder value="-1"/>
-						<acreatorDiagramType value="ClassDiagram"/>
-						<aselectable value="true"/>
-						<arequestResetCaption value="false"/>
-						<arequestResetCaptionSize value="false"/>
-						<aconnectorStyle value="3"/>
-						<aconnectorLineJumps value="4"/>
-						<aconnectorLabelOrientation value="4"/>
-						<afromShapeXDiff value="0"/>
-						<afromShapeYDiff value="0"/>
-						<atoShapeXDiff value="0"/>
-						<atoShapeYDiff value="0"/>
-						<afromConnectType value="0"/>
-						<atoConnectType value="0"/>
-						<auseFromShapeCenter value="true"/>
-						<auseToShapeCenter value="true"/>
-						<afromPinType value="1"/>
-						<atoPinType value="1"/>
-						<arequestRebuild value="false"/>
-						<ashowConnectorName value="2"/>
-						<apaintThroughLabel value="2"/>
-						<ahasRoleAShape value="false"/>
-						<ahasRoleBShape value="true"/>
-						<ashowMultiplicityConstraints value="false"/>
-						<aroleARectangle value="Re:530.0,290.0,40.0,20.0"/>
-						<aroleBRectangle value="Re:60.0,310.0,56.0,14.0"/>
-						<ahasMultiplicityAShape value="false"/>
-						<ahasMultiplicityBShape value="false"/>
-						<a0SwDr value="false"/>
-						<ashowStereotypes value="true"/>
-						<ashowFromRoleName value="true"/>
-						<ashowToRoleName value="true"/>
-						<ashowFromMultiplicity value="true"/>
-						<ashowToMultiplicity value="true"/>
-						<ashowFromRoleVisibility value="true"/>
-						<ashowToRoleVisibility value="true"/>
-						<ashowAssociationEndPropertyStrings value="false"/>
-						<ahasAssociationEndPropertyStringsAShape value="false"/>
-						<ahasAssociationEndPropertyStringsBShape value="false"/>
-						<afromRoleInternalWidth value="-2147483648"/>
-						<afromRoleInternalHeight value="-2147483648"/>
-						<atoRoleInternalWidth value="-2147483648"/>
-						<atoRoleInternalHeight value="-2147483648"/>
-						<afromMultiplicityInternalWidth value="-2147483648"/>
-						<afromMultiplicityInternalHeight value="-2147483648"/>
-						<atoMultiplicityInternalWidth value="-2147483648"/>
-						<atoMultiplicityInternalHeight value="-2147483648"/>
-						<aassociationEndPropertyStringsAInternalWidth value="-2147483648"/>
-						<aassociationEndPropertyStringsAInternalHeight value="-2147483648"/>
-						<aassociationEndPropertyStringsBInternalWidth value="-2147483648"/>
-						<aassociationEndPropertyStringsBInternalHeight value="-2147483648"/>
-					</properties>
-				</xmi:Extension>
-				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
-				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
-			</uml:DiagramElement>
-			<uml:DiagramElement geometry="330,400;330,400;330,439;" preferredShapeType="AssociationClass" subject="nOo.WuyEwTiAAgYg" xmi:id="XOo.WuyEwTiAAgYh">
-				<xmi:Extension extender="Visual Paradigm for UML">
-					<captionBounds value="313,456,20,0"/>
-					<captionInternalWidth value="-2147483648"/>
-					<captionInternalHeight value="-2147483648"/>
-					<captionVisible value="true"/>
-					<captionSide value="1"/>
-					<properties>
-						<abackground value="Cr:122,207,245,255"/>
-						<aforeground value="Cr:0,0,0,255"/>
-						<azOrder value="-1"/>
-						<aselectable value="true"/>
-						<arequestResetCaption value="false"/>
-						<arequestResetCaptionSize value="false"/>
-						<aconnectorStyle value="3"/>
-						<aconnectorLineJumps value="4"/>
-						<aconnectorLabelOrientation value="4"/>
-						<afromShapeXDiff value="0"/>
-						<afromShapeYDiff value="0"/>
-						<atoShapeXDiff value="0"/>
-						<atoShapeYDiff value="0"/>
-						<afromConnectType value="0"/>
-						<atoConnectType value="0"/>
-						<auseFromShapeCenter value="true"/>
-						<auseToShapeCenter value="true"/>
-						<afromPinType value="1"/>
-						<atoPinType value="1"/>
-						<arequestRebuild value="false"/>
-						<ashowConnectorName value="2"/>
-						<apaintThroughLabel value="2"/>
-					</properties>
-				</xmi:Extension>
-				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
-				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
-			</uml:DiagramElement>
-			<uml:DiagramElement geometry="370,490;580,490;580,290;" preferredShapeType="Association" subject="cn9.WuyEwTiAAgZN" xmi:id="cn9.WuyEwTiAAgZS">
-				<xmi:Extension extender="Visual Paradigm for UML">
-					<captionBounds value="520,500,55,14"/>
-					<captionInternalWidth value="-2147483648"/>
-					<captionInternalHeight value="-2147483648"/>
-					<captionVisible value="true"/>
-					<captionSide value="1"/>
-					<properties>
-						<abackground value="Cr:122,207,245,255"/>
-						<aforeground value="Cr:0,0,0,255"/>
-						<azOrder value="-1"/>
-						<acreatorDiagramType value="ClassDiagram"/>
-						<aselectable value="true"/>
-						<arequestResetCaption value="false"/>
-						<arequestResetCaptionSize value="false"/>
-						<aconnectorStyle value="3"/>
-						<aconnectorLineJumps value="4"/>
-						<aconnectorLabelOrientation value="4"/>
-						<afromShapeXDiff value="0"/>
-						<afromShapeYDiff value="0"/>
-						<atoShapeXDiff value="0"/>
-						<atoShapeYDiff value="0"/>
-						<afromConnectType value="0"/>
-						<atoConnectType value="0"/>
-						<auseFromShapeCenter value="true"/>
-						<auseToShapeCenter value="true"/>
-						<afromPinType value="1"/>
-						<atoPinType value="1"/>
-						<arequestRebuild value="false"/>
-						<ashowConnectorName value="2"/>
-						<apaintThroughLabel value="2"/>
-						<ahasRoleAShape value="false"/>
-						<ahasRoleBShape value="false"/>
-						<ashowMultiplicityConstraints value="false"/>
-						<aroleBRectangle value="Re:570.0,290.0,40.0,20.0"/>
-						<ahasMultiplicityAShape value="false"/>
-						<ahasMultiplicityBShape value="false"/>
-						<a0SwDr value="false"/>
-						<ashowStereotypes value="true"/>
-						<ashowFromRoleName value="true"/>
-						<ashowToRoleName value="true"/>
-						<ashowFromMultiplicity value="true"/>
-						<ashowToMultiplicity value="true"/>
-						<ashowFromRoleVisibility value="true"/>
-						<ashowToRoleVisibility value="true"/>
-						<ashowAssociationEndPropertyStrings value="false"/>
-						<ahasAssociationEndPropertyStringsAShape value="false"/>
-						<ahasAssociationEndPropertyStringsBShape value="false"/>
-						<afromRoleInternalWidth value="-2147483648"/>
-						<afromRoleInternalHeight value="-2147483648"/>
-						<atoRoleInternalWidth value="-2147483648"/>
-						<atoRoleInternalHeight value="-2147483648"/>
-						<afromMultiplicityInternalWidth value="-2147483648"/>
-						<afromMultiplicityInternalHeight value="-2147483648"/>
-						<atoMultiplicityInternalWidth value="-2147483648"/>
-						<atoMultiplicityInternalHeight value="-2147483648"/>
-						<aassociationEndPropertyStringsAInternalWidth value="-2147483648"/>
-						<aassociationEndPropertyStringsAInternalHeight value="-2147483648"/>
-						<aassociationEndPropertyStringsBInternalWidth value="-2147483648"/>
-						<aassociationEndPropertyStringsBInternalHeight value="-2147483648"/>
-					</properties>
-				</xmi:Extension>
-				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
-				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
-			</uml:DiagramElement>
-			<uml:DiagramElement geometry="160,300,80,64" preferredShapeType="Class" subject="tkL1WuyEwTiAAgcE" xmi:id="tkL1WuyEwTiAAgcD">
-				<xmi:Extension extender="Visual Paradigm for UML">
-					<captionBounds value="0,0,80,14"/>
+			<uml:DiagramElement geometry="670,330,110,50" preferredShapeType="Class" subject="cSnjeuyCiu1SNwVU" xmi:id="sSnjeuyCiu1SNwVT">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<captionBounds value="0,0,110,14"/>
 					<captionInternalWidth value="-2147483648"/>
 					<captionInternalHeight value="-2147483648"/>
 					<captionVisible value="true"/>
@@ -7908,18 +8663,58 @@
 				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
 				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
 			</uml:DiagramElement>
-			<uml:DiagramElement geometry="270,300,120,64" preferredShapeType="Class" subject="9un1WuyEwTiAAgcK" xmi:id="9un1WuyEwTiAAgcJ">
-				<xmi:Extension extender="Visual Paradigm for UML">
-					<captionBounds value="0,0,120,14"/>
+			<uml:DiagramElement geometry="0,0,40,40" preferredShapeType="SEText" subject="2351BuyCiu1SNwdG" xmi:id="W351BuyCiu1SNwdF">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<captionBounds value="0,0,40,40"/>
+					<captionInternalWidth value="-2147483648"/>
+					<captionInternalHeight value="-2147483648"/>
+					<captionVisible value="false"/>
+					<captionSide value="7"/>
+					<properties>
+						<abackground value="Cr:122,207,245,255"/>
+						<aforeground value="Cr:0,0,0,255"/>
+						<azOrder value="10"/>
+						<aselectable value="true"/>
+						<arequestResetCaption value="false"/>
+						<arequestResetCaptionSize value="false"/>
+						<adisplayStereotypeIcon value="false"/>
+						<aoverrideAppearanceWithStereotypeIcon value="true"/>
+						<arequestSetSizeOption value="0"/>
+						<aparentConnectorHeaderLength value="40"/>
+						<aparentConnectorLineLength value="10"/>
+						<aconnectToPoint value="true"/>
+						<aparentConnectorDTheta value="0.0"/>
+						<aconnectionPointType value="2"/>
+						<amodelElementNameAlignment value="9"/>
+						<arequestDefaultSize value="false"/>
+						<arequestFitSize value="false"/>
+						<arequestFitSizeFromCenter value="false"/>
+						<aobjectId value="0"/>
+						<aobjectType value="0"/>
+						<anotUseVisibleBounds value="false"/>
+						<aalpha value="0.0"/>
+						<arotateAngle value="0.0"/>
+						<atop value="0.0"/>
+						<aleft value="0.0"/>
+						<abottom value="0.0"/>
+						<aright value="0.0"/>
+					</properties>
+				</xmi:Extension>
+				<elementFill color1="Cr:122,207,245,255" color2="" style="1" transparency="0" type="1"/>
+				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
+				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
+			</uml:DiagramElement>
+			<uml:DiagramElement geometry="320,440,100,40" preferredShapeType="Class" subject="n0UGjuyCiu1SNwmv" xmi:id="n0UGjuyCiu1SNwmu">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<captionBounds value="0,0,100,28"/>
 					<captionInternalWidth value="-2147483648"/>
 					<captionInternalHeight value="-2147483648"/>
 					<captionVisible value="true"/>
 					<captionSide value="12"/>
 					<properties>
-						<abackground value="Cr:192,192,192,255"/>
-						<aforeground value="Cr:0,0,0,255"/>
-						<azOrder value="10"/>
-						<acreatorDiagramType value="ClassDiagram"/>
+						<abackground value="Cr:192,255,192,255"/>
+						<aforeground value="Cr:0,0,0,255"/>
+						<azOrder value="4"/>
 						<aselectable value="true"/>
 						<arequestResetCaption value="false"/>
 						<arequestResetCaptionSize value="false"/>
@@ -7969,183 +8764,13 @@
 						<ashowOperationsReturnType value="0"/>
 					</properties>
 				</xmi:Extension>
-				<elementFill color1="Cr:192,192,192,255" color2="" style="1" transparency="0" type="1"/>
-				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
-				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
-			</uml:DiagramElement>
-			<uml:DiagramElement geometry="410,420,120,64" preferredShapeType="Class" subject="q8f1WuyEwTiAAgcQ" xmi:id="q8f1WuyEwTiAAgcP">
-				<xmi:Extension extender="Visual Paradigm for UML">
-					<captionBounds value="0,0,120,14"/>
-					<captionInternalWidth value="-2147483648"/>
-					<captionInternalHeight value="-2147483648"/>
-					<captionVisible value="true"/>
-					<captionSide value="12"/>
-					<properties>
-						<abackground value="Cr:192,192,192,255"/>
-						<aforeground value="Cr:0,0,0,255"/>
-						<azOrder value="8"/>
-						<acreatorDiagramType value="ClassDiagram"/>
-						<aselectable value="true"/>
-						<arequestResetCaption value="false"/>
-						<arequestResetCaptionSize value="false"/>
-						<adisplayStereotypeIcon value="false"/>
-						<aoverrideAppearanceWithStereotypeIcon value="true"/>
-						<arequestSetSizeOption value="0"/>
-						<aparentConnectorHeaderLength value="40"/>
-						<aparentConnectorLineLength value="10"/>
-						<aconnectToPoint value="true"/>
-						<aparentConnectorDTheta value="0.0"/>
-						<aconnectionPointType value="2"/>
-						<amodelElementNameAlignment value="9"/>
-						<arequestDefaultSize value="false"/>
-						<arequestFitSize value="false"/>
-						<arequestFitSizeFromCenter value="false"/>
-						<adisplayAsRobustnessAnalysisIcon value="true"/>
-						<avisibilityStyle value="1"/>
-						<ashowAttributeType value="1"/>
-						<ashowOperationType value="1"/>
-						<amSwTpPts value="true"/>
-						<alshRfAts value="true"/>
-						<amShDrAt value="false"/>
-						<akShDrOp value="false"/>
-						<akSwCsMbSt value="true"/>
-						<ashowClassMemberConstraints value="true"/>
-						<alShCmMl value="false"/>
-						<ashowOperationParameterDirection value="false"/>
-						<ashowOperationRaisedExceptions value="false"/>
-						<ashowParameterNameInOperationSignature value="true"/>
-						<ashowOperationTemplateParameters value="false"/>
-						<ashowOperationProperties value="false"/>
-						<awpMbs value="false"/>
-						<aattributeSortType value="0"/>
-						<aoperationSortType value="0"/>
-						<ashowInitialAttributeValue value="true"/>
-						<ashowOperationSignature value="true"/>
-						<ainterfaceBall value="false"/>
-						<ashowEmptyCompartments value="0"/>
-						<ashowEllipsisForUnshownMembers value="0"/>
-						<ashowAttributesCodeDetails value="0"/>
-						<ashowOperationsCodeDetails value="0"/>
-						<ashowParametersCodeDetails value="0"/>
-						<ashowTypeOption value="0"/>
-						<ashowOwnerOption value="3"/>
-						<ashowAttributesType value="0"/>
-						<ashowOperationsParameters value="0"/>
-						<ashowOperationsReturnType value="0"/>
-					</properties>
-				</xmi:Extension>
-				<elementFill color1="Cr:192,192,192,255" color2="" style="1" transparency="0" type="1"/>
-				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
-				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
-			</uml:DiagramElement>
-			<uml:DiagramElement geometry="200,190;200,299;" preferredShapeType="AssociationClass" subject="MDhNWuyEwTiAAgc4" xmi:id="MDhNWuyEwTiAAgc5">
-				<xmi:Extension extender="Visual Paradigm for UML">
-					<captionBounds value="210,264,20,0"/>
-					<captionInternalWidth value="-2147483648"/>
-					<captionInternalHeight value="-2147483648"/>
-					<captionVisible value="true"/>
-					<captionSide value="1"/>
-					<properties>
-						<abackground value="Cr:122,207,245,255"/>
-						<aforeground value="Cr:0,0,0,255"/>
-						<azOrder value="-1"/>
-						<aselectable value="true"/>
-						<arequestResetCaption value="false"/>
-						<arequestResetCaptionSize value="false"/>
-						<aconnectorStyle value="3"/>
-						<aconnectorLineJumps value="4"/>
-						<aconnectorLabelOrientation value="4"/>
-						<afromShapeXDiff value="0"/>
-						<afromShapeYDiff value="0"/>
-						<atoShapeXDiff value="0"/>
-						<atoShapeYDiff value="0"/>
-						<afromConnectType value="0"/>
-						<atoConnectType value="0"/>
-						<auseFromShapeCenter value="true"/>
-						<auseToShapeCenter value="true"/>
-						<afromPinType value="1"/>
-						<atoPinType value="1"/>
-						<arequestRebuild value="false"/>
-						<ashowConnectorName value="2"/>
-						<apaintThroughLabel value="2"/>
-					</properties>
-				</xmi:Extension>
-				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
-				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
-			</uml:DiagramElement>
-			<uml:DiagramElement geometry="300,230;300,299;" preferredShapeType="AssociationClass" subject="fPPNWuyEwTiAAgdW" xmi:id="fPPNWuyEwTiAAgdX">
-				<xmi:Extension extender="Visual Paradigm for UML">
-					<captionBounds value="310,284,20,0"/>
-					<captionInternalWidth value="-2147483648"/>
-					<captionInternalHeight value="-2147483648"/>
-					<captionVisible value="true"/>
-					<captionSide value="1"/>
-					<properties>
-						<abackground value="Cr:122,207,245,255"/>
-						<aforeground value="Cr:0,0,0,255"/>
-						<azOrder value="-1"/>
-						<aselectable value="true"/>
-						<arequestResetCaption value="false"/>
-						<arequestResetCaptionSize value="false"/>
-						<aconnectorStyle value="3"/>
-						<aconnectorLineJumps value="4"/>
-						<aconnectorLabelOrientation value="4"/>
-						<afromShapeXDiff value="0"/>
-						<afromShapeYDiff value="0"/>
-						<atoShapeXDiff value="0"/>
-						<atoShapeYDiff value="0"/>
-						<afromConnectType value="0"/>
-						<atoConnectType value="0"/>
-						<auseFromShapeCenter value="true"/>
-						<auseToShapeCenter value="true"/>
-						<afromPinType value="1"/>
-						<atoPinType value="1"/>
-						<arequestRebuild value="false"/>
-						<ashowConnectorName value="2"/>
-						<apaintThroughLabel value="2"/>
-					</properties>
-				</xmi:Extension>
-				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
-				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
-			</uml:DiagramElement>
-			<uml:DiagramElement geometry="450,270;450,419;" preferredShapeType="AssociationClass" subject="i8MtWuyEwTiAAgdo" xmi:id="i8MtWuyEwTiAAgdp">
-				<xmi:Extension extender="Visual Paradigm for UML">
-					<captionBounds value="460,424,20,0"/>
-					<captionInternalWidth value="-2147483648"/>
-					<captionInternalHeight value="-2147483648"/>
-					<captionVisible value="true"/>
-					<captionSide value="1"/>
-					<properties>
-						<abackground value="Cr:122,207,245,255"/>
-						<aforeground value="Cr:0,0,0,255"/>
-						<azOrder value="-1"/>
-						<aselectable value="true"/>
-						<arequestResetCaption value="false"/>
-						<arequestResetCaptionSize value="false"/>
-						<aconnectorStyle value="3"/>
-						<aconnectorLineJumps value="4"/>
-						<aconnectorLabelOrientation value="4"/>
-						<afromShapeXDiff value="0"/>
-						<afromShapeYDiff value="0"/>
-						<atoShapeXDiff value="0"/>
-						<atoShapeYDiff value="0"/>
-						<afromConnectType value="0"/>
-						<atoConnectType value="0"/>
-						<auseFromShapeCenter value="true"/>
-						<auseToShapeCenter value="true"/>
-						<afromPinType value="1"/>
-						<atoPinType value="1"/>
-						<arequestRebuild value="false"/>
-						<ashowConnectorName value="2"/>
-						<apaintThroughLabel value="2"/>
-					</properties>
-				</xmi:Extension>
-				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
-				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
-			</uml:DiagramElement>
-			<uml:DiagramElement geometry="610,169;610,130;690,130;690,230;630,230;" preferredShapeType="Association" subject="g1DjeuyCiu1SNwVB" xmi:id="E1DjeuyCiu1SNwVN">
-				<xmi:Extension extender="Visual Paradigm for UML">
-					<captionBounds value="640,110,102,14"/>
+				<elementFill color1="Cr:192,255,192,255" color2="" style="1" transparency="0" type="1"/>
+				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
+				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
+			</uml:DiagramElement>
+			<uml:DiagramElement geometry="360,390;360,439;" preferredShapeType="Association" subject="fOWGjuyCiu1SNwnM" xmi:id="_OWGjuyCiu1SNwnR">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<captionBounds value="355,398,44,14"/>
 					<captionInternalWidth value="-2147483648"/>
 					<captionInternalHeight value="-2147483648"/>
 					<captionVisible value="true"/>
@@ -8207,290 +8832,200 @@
 				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
 				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
 			</uml:DiagramElement>
-			<uml:DiagramElement geometry="670,300,110,50" preferredShapeType="Class" subject="cSnjeuyCiu1SNwVU" xmi:id="sSnjeuyCiu1SNwVT">
-				<xmi:Extension extender="Visual Paradigm for UML">
-					<captionBounds value="0,0,110,14"/>
-					<captionInternalWidth value="-2147483648"/>
-					<captionInternalHeight value="-2147483648"/>
-					<captionVisible value="true"/>
-					<captionSide value="12"/>
-					<properties>
-						<abackground value="Cr:192,192,192,255"/>
-						<aforeground value="Cr:0,0,0,255"/>
-						<azOrder value="6"/>
-						<acreatorDiagramType value="ClassDiagram"/>
-						<aselectable value="true"/>
-						<arequestResetCaption value="false"/>
-						<arequestResetCaptionSize value="false"/>
-						<adisplayStereotypeIcon value="false"/>
-						<aoverrideAppearanceWithStereotypeIcon value="true"/>
-						<arequestSetSizeOption value="0"/>
-						<aparentConnectorHeaderLength value="40"/>
-						<aparentConnectorLineLength value="10"/>
-						<aconnectToPoint value="true"/>
-						<aparentConnectorDTheta value="0.0"/>
-						<aconnectionPointType value="2"/>
-						<amodelElementNameAlignment value="9"/>
-						<arequestDefaultSize value="false"/>
-						<arequestFitSize value="false"/>
-						<arequestFitSizeFromCenter value="false"/>
-						<adisplayAsRobustnessAnalysisIcon value="true"/>
-						<avisibilityStyle value="1"/>
-						<ashowAttributeType value="1"/>
-						<ashowOperationType value="1"/>
-						<amSwTpPts value="true"/>
-						<alshRfAts value="true"/>
-						<amShDrAt value="false"/>
-						<akShDrOp value="false"/>
-						<akSwCsMbSt value="true"/>
-						<ashowClassMemberConstraints value="true"/>
-						<alShCmMl value="false"/>
-						<ashowOperationParameterDirection value="false"/>
-						<ashowOperationRaisedExceptions value="false"/>
-						<ashowParameterNameInOperationSignature value="true"/>
-						<ashowOperationTemplateParameters value="false"/>
-						<ashowOperationProperties value="false"/>
-						<awpMbs value="false"/>
-						<aattributeSortType value="0"/>
-						<aoperationSortType value="0"/>
-						<ashowInitialAttributeValue value="true"/>
-						<ashowOperationSignature value="true"/>
-						<ainterfaceBall value="false"/>
-						<ashowEmptyCompartments value="0"/>
-						<ashowEllipsisForUnshownMembers value="0"/>
-						<ashowAttributesCodeDetails value="0"/>
-						<ashowOperationsCodeDetails value="0"/>
-						<ashowParametersCodeDetails value="0"/>
-						<ashowTypeOption value="0"/>
-						<ashowOwnerOption value="3"/>
-						<ashowAttributesType value="0"/>
-						<ashowOperationsParameters value="0"/>
-						<ashowOperationsReturnType value="0"/>
-					</properties>
-				</xmi:Extension>
-				<elementFill color1="Cr:192,192,192,255" color2="" style="1" transparency="0" type="1"/>
-				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
-				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
-			</uml:DiagramElement>
-			<uml:DiagramElement geometry="680,230;680,299;" preferredShapeType="AssociationClass" subject="fUCTeuyCiu1SNwWy" xmi:id="fUCTeuyCiu1SNwWz">
-				<xmi:Extension extender="Visual Paradigm for UML">
-					<captionBounds value="690,280,20,0"/>
-					<captionInternalWidth value="-2147483648"/>
-					<captionInternalHeight value="-2147483648"/>
-					<captionVisible value="true"/>
-					<captionSide value="1"/>
-					<properties>
-						<abackground value="Cr:122,207,245,255"/>
-						<aforeground value="Cr:0,0,0,255"/>
-						<azOrder value="-1"/>
-						<aselectable value="true"/>
-						<arequestResetCaption value="false"/>
-						<arequestResetCaptionSize value="false"/>
-						<aconnectorStyle value="3"/>
-						<aconnectorLineJumps value="4"/>
-						<aconnectorLabelOrientation value="4"/>
-						<afromShapeXDiff value="0"/>
-						<afromShapeYDiff value="0"/>
-						<atoShapeXDiff value="0"/>
-						<atoShapeYDiff value="0"/>
-						<afromConnectType value="0"/>
-						<atoConnectType value="0"/>
-						<auseFromShapeCenter value="true"/>
-						<auseToShapeCenter value="true"/>
-						<afromPinType value="1"/>
-						<atoPinType value="1"/>
-						<arequestRebuild value="false"/>
-						<ashowConnectorName value="2"/>
-						<apaintThroughLabel value="2"/>
-					</properties>
-				</xmi:Extension>
-				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
-				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
-			</uml:DiagramElement>
-			<uml:DiagramElement geometry="16,136,652,262" preferredShapeType="SECurveShape" subject="1XzVBuyCiu1SNwcI" xmi:id="lXzVBuyCiu1SNwcH">
-				<xmi:Extension extender="Visual Paradigm for UML">
-					<captionBounds value="0,0,40,40"/>
-					<captionInternalWidth value="-2147483648"/>
-					<captionInternalHeight value="-2147483648"/>
-					<captionVisible value="false"/>
-					<captionSide value="7"/>
-					<properties>
-						<abackground value="Cr:255,224,192,84"/>
-						<aforeground value="Cr:0,0,0,255"/>
-						<azOrder value="22"/>
-						<aselectable value="true"/>
-						<arequestResetCaption value="false"/>
-						<arequestResetCaptionSize value="false"/>
-						<adisplayStereotypeIcon value="false"/>
-						<aoverrideAppearanceWithStereotypeIcon value="true"/>
-						<arequestSetSizeOption value="0"/>
-						<aparentConnectorHeaderLength value="40"/>
-						<aparentConnectorLineLength value="10"/>
-						<aconnectToPoint value="true"/>
-						<aparentConnectorDTheta value="0.0"/>
-						<aconnectionPointType value="2"/>
-						<amodelElementNameAlignment value="9"/>
-						<arequestDefaultSize value="false"/>
-						<arequestFitSize value="false"/>
-						<arequestFitSizeFromCenter value="false"/>
-						<aobjectId value="22"/>
-						<aobjectType value="9096"/>
-						<anotUseVisibleBounds value="false"/>
-						<aalpha value="1.0"/>
-						<arotateAngle value="0.0"/>
-						<anodeName value="VPCurveShape"/>
-						<aactConnector value="true"/>
-						<adrawBy value="3"/>
-					</properties>
-					<FontFormat fontColor="Cr:0,0,0,255">
-						<Font name="Dialog" size="11" style="0"/>
-					</FontFormat>
-					<Label location="Pt:342.0,267.0" text=""/>
-					<Label transparency="0" tx="0.0" ty="0.0" type="0">
-						<FillFormat renderStyle="1">
-							<AffineTransformMatrix>
-								<Matrix value="1.0032154340836015"/>
-								<Matrix value="0.0"/>
-								<Matrix value="0.0"/>
-								<Matrix value="0.9435483870967744"/>
-								<Matrix value="-0.09646302250804695"/>
-								<Matrix value="0.9193548387096969"/>
-							</AffineTransformMatrix>
-							<Render color="Cr:0,0,0,255"/>
-						</FillFormat>
-					</Label>
-					<ShapeBasePoint point="Pt:342.0000000000001,267.0"/>
-					<Arrow endArrow="0" startArrow="0"/>
-					<LineFormat color="Cr:0,0,0,255" style="91" width="1.0">
-						<Stroke cap="0" dashPhase="0.0" join="2" miterlimit="0.0" type="0" width="1.0"/>
-					</LineFormat>
-					<FillFormat renderStyle="1">
-						<AffineTransformMatrix>
-							<Matrix value="1.0032154340836015"/>
-							<Matrix value="0.0"/>
-							<Matrix value="0.0"/>
-							<Matrix value="0.9435483870967744"/>
-							<Matrix value="-0.09646302250804695"/>
-							<Matrix value="0.9193548387096969"/>
-						</AffineTransformMatrix>
-						<Render color="Cr:255,224,192,84"/>
-					</FillFormat>
-					<CurveList windingRule="1">
-						<Curves>
-							<Curve controlPoint1="Pt:186.00000000000006,149.99999999999997" controlPoint2="Pt:498.0000000000001,149.99999999999997" endPoint="Pt:654.0000000000002,149.99999999999997" objectId="1" startPoint="Pt:30.0,149.99999999999997"/>
-							<Curve controlPoint1="Pt:654.0000000000002,208.50000000000003" controlPoint2="Pt:654.0000000000002,325.5" endPoint="Pt:654.0000000000002,384.0" objectId="2" startPoint="Pt:654.0000000000002,149.99999999999997"/>
-							<Curve controlPoint1="Pt:498.0000000000001,384.0" controlPoint2="Pt:186.00000000000006,384.0" endPoint="Pt:30.0,384.0" objectId="3" startPoint="Pt:654.0000000000002,384.0"/>
-							<Curve controlPoint1="Pt:30.0,325.5" controlPoint2="Pt:30.0,208.50000000000003" endPoint="Pt:30.0,149.99999999999997" objectId="4" startPoint="Pt:30.0,384.0"/>
-						</Curves>
-					</CurveList>
-				</xmi:Extension>
-				<elementFill color1="Cr:255,224,192,84" color2="" style="1" transparency="67" type="1"/>
-				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
-				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
-			</uml:DiagramElement>
-			<uml:DiagramElement geometry="0,0,40,40" preferredShapeType="SEText" subject="2351BuyCiu1SNwdG" xmi:id="W351BuyCiu1SNwdF">
-				<xmi:Extension extender="Visual Paradigm for UML">
-					<captionBounds value="0,0,40,40"/>
-					<captionInternalWidth value="-2147483648"/>
-					<captionInternalHeight value="-2147483648"/>
-					<captionVisible value="false"/>
-					<captionSide value="7"/>
-					<properties>
-						<abackground value="Cr:122,207,245,255"/>
-						<aforeground value="Cr:0,0,0,255"/>
-						<azOrder value="0"/>
-						<aselectable value="true"/>
-						<arequestResetCaption value="false"/>
-						<arequestResetCaptionSize value="false"/>
-						<adisplayStereotypeIcon value="false"/>
-						<aoverrideAppearanceWithStereotypeIcon value="true"/>
-						<arequestSetSizeOption value="0"/>
-						<aparentConnectorHeaderLength value="40"/>
-						<aparentConnectorLineLength value="10"/>
-						<aconnectToPoint value="true"/>
-						<aparentConnectorDTheta value="0.0"/>
-						<aconnectionPointType value="2"/>
-						<amodelElementNameAlignment value="9"/>
-						<arequestDefaultSize value="false"/>
-						<arequestFitSize value="false"/>
-						<arequestFitSizeFromCenter value="false"/>
-						<aobjectId value="0"/>
-						<aobjectType value="0"/>
-						<anotUseVisibleBounds value="false"/>
-						<aalpha value="0.0"/>
-						<arotateAngle value="0.0"/>
-						<atop value="0.0"/>
-						<aleft value="0.0"/>
-						<abottom value="0.0"/>
-						<aright value="0.0"/>
-					</properties>
-				</xmi:Extension>
-				<elementFill color1="Cr:122,207,245,255" color2="" style="1" transparency="0" type="1"/>
-				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
-				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
-			</uml:DiagramElement>
-		</uml:Diagram.element>
-	</uml:Diagram>
-	<uml:Diagram diagramType="ClassDiagram" documentation="" name="Component3" toolName="Visual Paradigm for UML" xmi:id="VRALWuyEwTiAAges">
-		<xmi:Extension extender="Visual Paradigm for UML">
-			<properties>
-				<apmAuthor value="lavm"/>
-				<apmCreateDateTime value="1337258412202"/>
-				<apmLastModified value="1337356582127"/>
-				<ashowPackageNameStyle value="0"/>
-				<ashowConnectorName value="0"/>
-				<apaintConnectorThroughLabel value="0"/>
-				<ashowActivityStateNodeCaption value="65535"/>
-				<aeditable value="true"/>
-				<afollowDiagramParentElement value="true"/>
-				<aautoFitShapesSize value="false"/>
-				<ashowTaggedValues value="false"/>
-				<ashowStereotypes value="true"/>
-				<ashowConstraints value="false"/>
-				<aalignToGrid value="true"/>
-				<agridVisible value="false"/>
-				<agridWidth value="10"/>
-				<agridHeight value="10"/>
-				<agridColor value="Cr:192,192,192,255"/>
-				<adiagramBackground value="Cr:255,255,255,255"/>
-				<aconnectorStyle value="1"/>
-				<aconnectorLineJumps value="0"/>
-				<aconnectorLineJumpsSize value="0"/>
-				<aconnectionPointStyle value="0"/>
-				<aconnectorLabelOrientation value="0"/>
-				<amodelElementNameAlignment value="4"/>
-				<azoomRatio value="1.0"/>
-				<amaximized value="true"/>
-				<ax value="0"/>
-				<ay value="0"/>
-				<awidth value="1235"/>
-				<aheight value="602"/>
-				<aqualityScore value="-1"/>
-				<aparentModel value="WzQLWuyEwTiAAgey"/>
-				<a_globalPaletteOption value="true"/>
-				<a_alwaysShowReferenceAndSubdiagramResource value="false"/>
-				<ainitializeDiagramForCreate value="true"/>
-				<arequestValidateSnapToGrid value="false"/>
-				<ashowDefaultPackage value="true"/>
-				<adefaultPackage value="WzQLWuyEwTiAAgey"/>
-				<ashowAttributeGetterSetter value="false"/>
-				<ashowClassOwner value="2"/>
-				<ashowPackageOwner value="2"/>
-				<ashowTemplateInfoOfGeneralizationAndRealization value="false"/>
-				<asuppressImplied1MultiplicityForAttributeAndAssociationEnd value="false"/>
-				<ashowClassEmptyCompartments value="2"/>
-				<ashowAttributesCodeDetails value="2"/>
-				<ashowAttributesType value="1"/>
-				<ashowOperationsParameters value="1"/>
-				<ashowOperationsReturnType value="1"/>
-				<ashowOperationsCodeDetails value="2"/>
-				<ashowParametersCodeDetails value="2"/>
-				<ashowEllipsisForUnshownClassMembers value="2"/>
-				<ageneralizationSetNotation value="2"/>
-			</properties>
-		</xmi:Extension>
-		<uml:Diagram.element>
-			<uml:DiagramElement geometry="700,100,80,80" preferredShapeType="Class" subject="vTljmuyEwTiAAgLp" xmi:id="7rBLWuyEwTiAAgfZ">
+			<uml:DiagramElement geometry="400,539;400,480;" preferredShapeType="Association" subject="t7OGjuyCiu1SNwnU" xmi:id="d7OGjuyCiu1SNwnZ">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<captionBounds value="390,497,20,0"/>
+					<captionInternalWidth value="-2147483648"/>
+					<captionInternalHeight value="-2147483648"/>
+					<captionVisible value="true"/>
+					<captionSide value="1"/>
+					<properties>
+						<abackground value="Cr:122,207,245,255"/>
+						<aforeground value="Cr:0,0,0,255"/>
+						<azOrder value="-1"/>
+						<acreatorDiagramType value="ClassDiagram"/>
+						<aselectable value="true"/>
+						<arequestResetCaption value="false"/>
+						<arequestResetCaptionSize value="false"/>
+						<aconnectorStyle value="3"/>
+						<aconnectorLineJumps value="4"/>
+						<aconnectorLabelOrientation value="4"/>
+						<afromShapeXDiff value="0"/>
+						<afromShapeYDiff value="0"/>
+						<atoShapeXDiff value="0"/>
+						<atoShapeYDiff value="0"/>
+						<afromConnectType value="0"/>
+						<atoConnectType value="0"/>
+						<auseFromShapeCenter value="true"/>
+						<auseToShapeCenter value="true"/>
+						<afromPinType value="1"/>
+						<atoPinType value="1"/>
+						<arequestRebuild value="false"/>
+						<ashowConnectorName value="2"/>
+						<apaintThroughLabel value="2"/>
+						<ahasRoleAShape value="false"/>
+						<ahasRoleBShape value="false"/>
+						<ashowMultiplicityConstraints value="false"/>
+						<aroleARectangle value="Re:370.0,500.0,40.0,20.0"/>
+						<ahasMultiplicityAShape value="false"/>
+						<ahasMultiplicityBShape value="false"/>
+						<a0SwDr value="false"/>
+						<ashowStereotypes value="true"/>
+						<ashowFromRoleName value="true"/>
+						<ashowToRoleName value="true"/>
+						<ashowFromMultiplicity value="true"/>
+						<ashowToMultiplicity value="true"/>
+						<ashowFromRoleVisibility value="true"/>
+						<ashowToRoleVisibility value="true"/>
+						<ashowAssociationEndPropertyStrings value="false"/>
+						<ahasAssociationEndPropertyStringsAShape value="false"/>
+						<ahasAssociationEndPropertyStringsBShape value="false"/>
+						<afromRoleInternalWidth value="-2147483648"/>
+						<afromRoleInternalHeight value="-2147483648"/>
+						<atoRoleInternalWidth value="-2147483648"/>
+						<atoRoleInternalHeight value="-2147483648"/>
+						<afromMultiplicityInternalWidth value="-2147483648"/>
+						<afromMultiplicityInternalHeight value="-2147483648"/>
+						<atoMultiplicityInternalWidth value="-2147483648"/>
+						<atoMultiplicityInternalHeight value="-2147483648"/>
+						<aassociationEndPropertyStringsAInternalWidth value="-2147483648"/>
+						<aassociationEndPropertyStringsAInternalHeight value="-2147483648"/>
+						<aassociationEndPropertyStringsBInternalWidth value="-2147483648"/>
+						<aassociationEndPropertyStringsBInternalHeight value="-2147483648"/>
+					</properties>
+				</xmi:Extension>
+				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
+				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
+			</uml:DiagramElement>
+			<uml:DiagramElement geometry="487,390;420,440;" preferredShapeType="Association" subject="yvTGjuyCiu1SNwn8" xmi:id="KvTGjuyCiu1SNwoB">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<captionBounds value="413,408,44,14"/>
+					<captionInternalWidth value="-2147483648"/>
+					<captionInternalHeight value="-2147483648"/>
+					<captionVisible value="true"/>
+					<captionSide value="1"/>
+					<properties>
+						<abackground value="Cr:122,207,245,255"/>
+						<aforeground value="Cr:0,0,0,255"/>
+						<azOrder value="-1"/>
+						<acreatorDiagramType value="ClassDiagram"/>
+						<aselectable value="true"/>
+						<arequestResetCaption value="false"/>
+						<arequestResetCaptionSize value="false"/>
+						<aconnectorStyle value="3"/>
+						<aconnectorLineJumps value="4"/>
+						<aconnectorLabelOrientation value="4"/>
+						<afromShapeXDiff value="0"/>
+						<afromShapeYDiff value="0"/>
+						<atoShapeXDiff value="0"/>
+						<atoShapeYDiff value="0"/>
+						<afromConnectType value="0"/>
+						<atoConnectType value="0"/>
+						<auseFromShapeCenter value="true"/>
+						<auseToShapeCenter value="true"/>
+						<afromPinType value="1"/>
+						<atoPinType value="1"/>
+						<arequestRebuild value="false"/>
+						<ashowConnectorName value="2"/>
+						<apaintThroughLabel value="2"/>
+						<ahasRoleAShape value="false"/>
+						<ahasRoleBShape value="false"/>
+						<ashowMultiplicityConstraints value="false"/>
+						<ahasMultiplicityAShape value="false"/>
+						<ahasMultiplicityBShape value="false"/>
+						<a0SwDr value="false"/>
+						<ashowStereotypes value="true"/>
+						<ashowFromRoleName value="true"/>
+						<ashowToRoleName value="true"/>
+						<ashowFromMultiplicity value="true"/>
+						<ashowToMultiplicity value="true"/>
+						<ashowFromRoleVisibility value="true"/>
+						<ashowToRoleVisibility value="true"/>
+						<ashowAssociationEndPropertyStrings value="false"/>
+						<ahasAssociationEndPropertyStringsAShape value="false"/>
+						<ahasAssociationEndPropertyStringsBShape value="false"/>
+						<afromRoleInternalWidth value="-2147483648"/>
+						<afromRoleInternalHeight value="-2147483648"/>
+						<atoRoleInternalWidth value="-2147483648"/>
+						<atoRoleInternalHeight value="-2147483648"/>
+						<afromMultiplicityInternalWidth value="-2147483648"/>
+						<afromMultiplicityInternalHeight value="-2147483648"/>
+						<atoMultiplicityInternalWidth value="-2147483648"/>
+						<atoMultiplicityInternalHeight value="-2147483648"/>
+						<aassociationEndPropertyStringsAInternalWidth value="-2147483648"/>
+						<aassociationEndPropertyStringsAInternalHeight value="-2147483648"/>
+						<aassociationEndPropertyStringsBInternalWidth value="-2147483648"/>
+						<aassociationEndPropertyStringsBInternalHeight value="-2147483648"/>
+					</properties>
+				</xmi:Extension>
+				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
+				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
+			</uml:DiagramElement>
+			<uml:DiagramElement geometry="350,539;350,480;" preferredShapeType="Association" subject="fyAmjuyCiu1SNwoH" xmi:id="fyAmjuyCiu1SNwoM">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<captionBounds value="354,513,20,0"/>
+					<captionInternalWidth value="-2147483648"/>
+					<captionInternalHeight value="-2147483648"/>
+					<captionVisible value="true"/>
+					<captionSide value="1"/>
+					<properties>
+						<abackground value="Cr:122,207,245,255"/>
+						<aforeground value="Cr:0,0,0,255"/>
+						<azOrder value="-1"/>
+						<acreatorDiagramType value="ClassDiagram"/>
+						<aselectable value="true"/>
+						<arequestResetCaption value="false"/>
+						<arequestResetCaptionSize value="false"/>
+						<aconnectorStyle value="3"/>
+						<aconnectorLineJumps value="4"/>
+						<aconnectorLabelOrientation value="4"/>
+						<afromShapeXDiff value="0"/>
+						<afromShapeYDiff value="0"/>
+						<atoShapeXDiff value="0"/>
+						<atoShapeYDiff value="0"/>
+						<afromConnectType value="0"/>
+						<atoConnectType value="0"/>
+						<auseFromShapeCenter value="true"/>
+						<auseToShapeCenter value="true"/>
+						<afromPinType value="1"/>
+						<atoPinType value="1"/>
+						<arequestRebuild value="false"/>
+						<ashowConnectorName value="2"/>
+						<apaintThroughLabel value="2"/>
+						<ahasRoleAShape value="false"/>
+						<ahasRoleBShape value="false"/>
+						<ashowMultiplicityConstraints value="false"/>
+						<ahasMultiplicityAShape value="false"/>
+						<ahasMultiplicityBShape value="false"/>
+						<a0SwDr value="false"/>
+						<ashowStereotypes value="true"/>
+						<ashowFromRoleName value="true"/>
+						<ashowToRoleName value="true"/>
+						<ashowFromMultiplicity value="true"/>
+						<ashowToMultiplicity value="true"/>
+						<ashowFromRoleVisibility value="true"/>
+						<ashowToRoleVisibility value="true"/>
+						<ashowAssociationEndPropertyStrings value="false"/>
+						<ahasAssociationEndPropertyStringsAShape value="false"/>
+						<ahasAssociationEndPropertyStringsBShape value="false"/>
+						<afromRoleInternalWidth value="-2147483648"/>
+						<afromRoleInternalHeight value="-2147483648"/>
+						<atoRoleInternalWidth value="-2147483648"/>
+						<atoRoleInternalHeight value="-2147483648"/>
+						<afromMultiplicityInternalWidth value="-2147483648"/>
+						<afromMultiplicityInternalHeight value="-2147483648"/>
+						<atoMultiplicityInternalWidth value="-2147483648"/>
+						<atoMultiplicityInternalHeight value="-2147483648"/>
+						<aassociationEndPropertyStringsAInternalWidth value="-2147483648"/>
+						<aassociationEndPropertyStringsAInternalHeight value="-2147483648"/>
+						<aassociationEndPropertyStringsBInternalWidth value="-2147483648"/>
+						<aassociationEndPropertyStringsBInternalHeight value="-2147483648"/>
+					</properties>
+				</xmi:Extension>
+				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
+				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
+			</uml:DiagramElement>
+			<uml:DiagramElement geometry="591,79,80,100" preferredShapeType="Class" subject="vTljmuyEwTiAAgLp" xmi:id="PTljmuyEwTiAAgLo">
 				<xmi:Extension extender="Visual Paradigm for UML">
 					<captionBounds value="0,0,80,14"/>
 					<captionInternalWidth value="-2147483648"/>
@@ -8500,7 +9035,8 @@
 					<properties>
 						<abackground value="Cr:122,207,245,255"/>
 						<aforeground value="Cr:0,0,0,255"/>
-						<azOrder value="17"/>
+						<azOrder value="2"/>
+						<acreatorDiagramType value="ClassDiagram"/>
 						<aselectable value="true"/>
 						<arequestResetCaption value="false"/>
 						<arequestResetCaptionSize value="false"/>
@@ -8554,7 +9090,363 @@
 				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
 				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
 			</uml:DiagramElement>
-			<uml:DiagramElement geometry="360,140,80,50" preferredShapeType="Class" subject="m6xjmuyEwTiAAgLk" xmi:id="B3VLWuyEwTiAAgfm">
+			<uml:DiagramElement geometry="470,539;470,520;660,520;660,179;" preferredShapeType="Association" subject="cn9.WuyEwTiAAgZN" xmi:id="cn9.WuyEwTiAAgZS">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<captionBounds value="580,520,55,14"/>
+					<captionInternalWidth value="-2147483648"/>
+					<captionInternalHeight value="-2147483648"/>
+					<captionVisible value="true"/>
+					<captionSide value="1"/>
+					<properties>
+						<abackground value="Cr:122,207,245,255"/>
+						<aforeground value="Cr:0,0,0,255"/>
+						<azOrder value="-1"/>
+						<acreatorDiagramType value="ClassDiagram"/>
+						<aselectable value="true"/>
+						<arequestResetCaption value="false"/>
+						<arequestResetCaptionSize value="false"/>
+						<aconnectorStyle value="3"/>
+						<aconnectorLineJumps value="4"/>
+						<aconnectorLabelOrientation value="4"/>
+						<afromShapeXDiff value="0"/>
+						<afromShapeYDiff value="0"/>
+						<atoShapeXDiff value="0"/>
+						<atoShapeYDiff value="0"/>
+						<afromConnectType value="0"/>
+						<atoConnectType value="0"/>
+						<auseFromShapeCenter value="true"/>
+						<auseToShapeCenter value="true"/>
+						<afromPinType value="1"/>
+						<atoPinType value="1"/>
+						<arequestRebuild value="false"/>
+						<ashowConnectorName value="2"/>
+						<apaintThroughLabel value="2"/>
+						<ahasRoleAShape value="false"/>
+						<ahasRoleBShape value="false"/>
+						<ashowMultiplicityConstraints value="false"/>
+						<aroleBRectangle value="Re:570.0,290.0,40.0,20.0"/>
+						<ahasMultiplicityAShape value="false"/>
+						<ahasMultiplicityBShape value="false"/>
+						<a0SwDr value="false"/>
+						<ashowStereotypes value="true"/>
+						<ashowFromRoleName value="true"/>
+						<ashowToRoleName value="true"/>
+						<ashowFromMultiplicity value="true"/>
+						<ashowToMultiplicity value="true"/>
+						<ashowFromRoleVisibility value="true"/>
+						<ashowToRoleVisibility value="true"/>
+						<ashowAssociationEndPropertyStrings value="false"/>
+						<ahasAssociationEndPropertyStringsAShape value="false"/>
+						<ahasAssociationEndPropertyStringsBShape value="false"/>
+						<afromRoleInternalWidth value="-2147483648"/>
+						<afromRoleInternalHeight value="-2147483648"/>
+						<atoRoleInternalWidth value="-2147483648"/>
+						<atoRoleInternalHeight value="-2147483648"/>
+						<afromMultiplicityInternalWidth value="-2147483648"/>
+						<afromMultiplicityInternalHeight value="-2147483648"/>
+						<atoMultiplicityInternalWidth value="-2147483648"/>
+						<atoMultiplicityInternalHeight value="-2147483648"/>
+						<aassociationEndPropertyStringsAInternalWidth value="-2147483648"/>
+						<aassociationEndPropertyStringsAInternalHeight value="-2147483648"/>
+						<aassociationEndPropertyStringsBInternalWidth value="-2147483648"/>
+						<aassociationEndPropertyStringsBInternalHeight value="-2147483648"/>
+					</properties>
+				</xmi:Extension>
+				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
+				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
+			</uml:DiagramElement>
+			<uml:DiagramElement geometry="330,539;330,500;650,500;650,179;" preferredShapeType="Association" subject="qsAeWuyEwTiAAgXg" xmi:id="qsAeWuyEwTiAAgXl">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<captionBounds value="580,486,51,14"/>
+					<captionInternalWidth value="-2147483648"/>
+					<captionInternalHeight value="-2147483648"/>
+					<captionVisible value="true"/>
+					<captionSide value="1"/>
+					<properties>
+						<abackground value="Cr:122,207,245,255"/>
+						<aforeground value="Cr:0,0,0,255"/>
+						<azOrder value="-1"/>
+						<acreatorDiagramType value="ClassDiagram"/>
+						<aselectable value="true"/>
+						<arequestResetCaption value="false"/>
+						<arequestResetCaptionSize value="false"/>
+						<aconnectorStyle value="3"/>
+						<aconnectorLineJumps value="4"/>
+						<aconnectorLabelOrientation value="4"/>
+						<afromShapeXDiff value="0"/>
+						<afromShapeYDiff value="0"/>
+						<atoShapeXDiff value="0"/>
+						<atoShapeYDiff value="0"/>
+						<afromConnectType value="0"/>
+						<atoConnectType value="0"/>
+						<auseFromShapeCenter value="true"/>
+						<auseToShapeCenter value="true"/>
+						<afromPinType value="1"/>
+						<atoPinType value="1"/>
+						<arequestRebuild value="false"/>
+						<ashowConnectorName value="2"/>
+						<apaintThroughLabel value="2"/>
+						<ahasRoleAShape value="false"/>
+						<ahasRoleBShape value="false"/>
+						<ashowMultiplicityConstraints value="false"/>
+						<ahasMultiplicityAShape value="false"/>
+						<ahasMultiplicityBShape value="false"/>
+						<a0SwDr value="false"/>
+						<ashowStereotypes value="true"/>
+						<ashowFromRoleName value="true"/>
+						<ashowToRoleName value="true"/>
+						<ashowFromMultiplicity value="true"/>
+						<ashowToMultiplicity value="true"/>
+						<ashowFromRoleVisibility value="true"/>
+						<ashowToRoleVisibility value="true"/>
+						<ashowAssociationEndPropertyStrings value="false"/>
+						<ahasAssociationEndPropertyStringsAShape value="false"/>
+						<ahasAssociationEndPropertyStringsBShape value="false"/>
+						<afromRoleInternalWidth value="-2147483648"/>
+						<afromRoleInternalHeight value="-2147483648"/>
+						<atoRoleInternalWidth value="-2147483648"/>
+						<atoRoleInternalHeight value="-2147483648"/>
+						<afromMultiplicityInternalWidth value="-2147483648"/>
+						<afromMultiplicityInternalHeight value="-2147483648"/>
+						<atoMultiplicityInternalWidth value="-2147483648"/>
+						<atoMultiplicityInternalHeight value="-2147483648"/>
+						<aassociationEndPropertyStringsAInternalWidth value="-2147483648"/>
+						<aassociationEndPropertyStringsAInternalHeight value="-2147483648"/>
+						<aassociationEndPropertyStringsBInternalWidth value="-2147483648"/>
+						<aassociationEndPropertyStringsBInternalHeight value="-2147483648"/>
+					</properties>
+				</xmi:Extension>
+				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
+				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
+			</uml:DiagramElement>
+			<uml:DiagramElement geometry="640,179;640,460;420,460;" preferredShapeType="Association" subject="qKNGjuyCiu1SNwnu" xmi:id="aKNGjuyCiu1SNwnz">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<captionBounds value="514,459,66,14"/>
+					<captionInternalWidth value="-2147483648"/>
+					<captionInternalHeight value="-2147483648"/>
+					<captionVisible value="true"/>
+					<captionSide value="1"/>
+					<properties>
+						<abackground value="Cr:122,207,245,255"/>
+						<aforeground value="Cr:0,0,0,255"/>
+						<azOrder value="-1"/>
+						<acreatorDiagramType value="ClassDiagram"/>
+						<aselectable value="true"/>
+						<arequestResetCaption value="false"/>
+						<arequestResetCaptionSize value="false"/>
+						<aconnectorStyle value="3"/>
+						<aconnectorLineJumps value="4"/>
+						<aconnectorLabelOrientation value="4"/>
+						<afromShapeXDiff value="0"/>
+						<afromShapeYDiff value="0"/>
+						<atoShapeXDiff value="0"/>
+						<atoShapeYDiff value="0"/>
+						<afromConnectType value="0"/>
+						<atoConnectType value="0"/>
+						<auseFromShapeCenter value="true"/>
+						<auseToShapeCenter value="true"/>
+						<afromPinType value="1"/>
+						<atoPinType value="1"/>
+						<arequestRebuild value="false"/>
+						<ashowConnectorName value="2"/>
+						<apaintThroughLabel value="2"/>
+						<ahasRoleAShape value="false"/>
+						<ahasRoleBShape value="false"/>
+						<ashowMultiplicityConstraints value="false"/>
+						<ahasMultiplicityAShape value="false"/>
+						<ahasMultiplicityBShape value="false"/>
+						<a0SwDr value="false"/>
+						<ashowStereotypes value="true"/>
+						<ashowFromRoleName value="true"/>
+						<ashowToRoleName value="true"/>
+						<ashowFromMultiplicity value="true"/>
+						<ashowToMultiplicity value="true"/>
+						<ashowFromRoleVisibility value="true"/>
+						<ashowToRoleVisibility value="true"/>
+						<ashowAssociationEndPropertyStrings value="false"/>
+						<ahasAssociationEndPropertyStringsAShape value="false"/>
+						<ahasAssociationEndPropertyStringsBShape value="false"/>
+						<afromRoleInternalWidth value="-2147483648"/>
+						<afromRoleInternalHeight value="-2147483648"/>
+						<atoRoleInternalWidth value="-2147483648"/>
+						<atoRoleInternalHeight value="-2147483648"/>
+						<afromMultiplicityInternalWidth value="-2147483648"/>
+						<afromMultiplicityInternalHeight value="-2147483648"/>
+						<atoMultiplicityInternalWidth value="-2147483648"/>
+						<atoMultiplicityInternalHeight value="-2147483648"/>
+						<aassociationEndPropertyStringsAInternalWidth value="-2147483648"/>
+						<aassociationEndPropertyStringsAInternalHeight value="-2147483648"/>
+						<aassociationEndPropertyStringsBInternalWidth value="-2147483648"/>
+						<aassociationEndPropertyStringsBInternalHeight value="-2147483648"/>
+					</properties>
+				</xmi:Extension>
+				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
+				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
+			</uml:DiagramElement>
+			<uml:DiagramElement geometry="630,179;630,450;420,450;" preferredShapeType="Association" subject="1YFGjuyCiu1SNwnk" xmi:id="NYFGjuyCiu1SNwnp">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<captionBounds value="510,430,71,14"/>
+					<captionInternalWidth value="-2147483648"/>
+					<captionInternalHeight value="-2147483648"/>
+					<captionVisible value="true"/>
+					<captionSide value="1"/>
+					<properties>
+						<abackground value="Cr:122,207,245,255"/>
+						<aforeground value="Cr:0,0,0,255"/>
+						<azOrder value="-1"/>
+						<acreatorDiagramType value="ClassDiagram"/>
+						<aselectable value="true"/>
+						<arequestResetCaption value="false"/>
+						<arequestResetCaptionSize value="false"/>
+						<aconnectorStyle value="3"/>
+						<aconnectorLineJumps value="4"/>
+						<aconnectorLabelOrientation value="4"/>
+						<afromShapeXDiff value="0"/>
+						<afromShapeYDiff value="0"/>
+						<atoShapeXDiff value="0"/>
+						<atoShapeYDiff value="0"/>
+						<afromConnectType value="0"/>
+						<atoConnectType value="0"/>
+						<auseFromShapeCenter value="true"/>
+						<auseToShapeCenter value="true"/>
+						<afromPinType value="1"/>
+						<atoPinType value="1"/>
+						<arequestRebuild value="false"/>
+						<ashowConnectorName value="2"/>
+						<apaintThroughLabel value="2"/>
+						<ahasRoleAShape value="false"/>
+						<ahasRoleBShape value="false"/>
+						<ashowMultiplicityConstraints value="false"/>
+						<ahasMultiplicityAShape value="false"/>
+						<ahasMultiplicityBShape value="false"/>
+						<a0SwDr value="false"/>
+						<ashowStereotypes value="true"/>
+						<ashowFromRoleName value="true"/>
+						<ashowToRoleName value="true"/>
+						<ashowFromMultiplicity value="true"/>
+						<ashowToMultiplicity value="true"/>
+						<ashowFromRoleVisibility value="true"/>
+						<ashowToRoleVisibility value="true"/>
+						<ashowAssociationEndPropertyStrings value="false"/>
+						<ahasAssociationEndPropertyStringsAShape value="false"/>
+						<ahasAssociationEndPropertyStringsBShape value="false"/>
+						<afromRoleInternalWidth value="-2147483648"/>
+						<afromRoleInternalHeight value="-2147483648"/>
+						<atoRoleInternalWidth value="-2147483648"/>
+						<atoRoleInternalHeight value="-2147483648"/>
+						<afromMultiplicityInternalWidth value="-2147483648"/>
+						<afromMultiplicityInternalHeight value="-2147483648"/>
+						<atoMultiplicityInternalWidth value="-2147483648"/>
+						<atoMultiplicityInternalHeight value="-2147483648"/>
+						<aassociationEndPropertyStringsAInternalWidth value="-2147483648"/>
+						<aassociationEndPropertyStringsAInternalHeight value="-2147483648"/>
+						<aassociationEndPropertyStringsBInternalWidth value="-2147483648"/>
+						<aassociationEndPropertyStringsBInternalHeight value="-2147483648"/>
+					</properties>
+				</xmi:Extension>
+				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
+				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
+			</uml:DiagramElement>
+			<uml:DiagramElement geometry="651,78;651,39;750,39;750,140;671,140;" preferredShapeType="Association" subject="g1DjeuyCiu1SNwVB" xmi:id="E1DjeuyCiu1SNwVN">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<captionBounds value="735,150,101,14"/>
+					<captionInternalWidth value="-2147483648"/>
+					<captionInternalHeight value="-2147483648"/>
+					<captionVisible value="true"/>
+					<captionSide value="1"/>
+					<properties>
+						<abackground value="Cr:122,207,245,255"/>
+						<aforeground value="Cr:0,0,0,255"/>
+						<azOrder value="-1"/>
+						<acreatorDiagramType value="ClassDiagram"/>
+						<aselectable value="true"/>
+						<arequestResetCaption value="false"/>
+						<arequestResetCaptionSize value="false"/>
+						<aconnectorStyle value="3"/>
+						<aconnectorLineJumps value="4"/>
+						<aconnectorLabelOrientation value="4"/>
+						<afromShapeXDiff value="0"/>
+						<afromShapeYDiff value="0"/>
+						<atoShapeXDiff value="0"/>
+						<atoShapeYDiff value="0"/>
+						<afromConnectType value="0"/>
+						<atoConnectType value="0"/>
+						<auseFromShapeCenter value="true"/>
+						<auseToShapeCenter value="true"/>
+						<afromPinType value="1"/>
+						<atoPinType value="1"/>
+						<arequestRebuild value="false"/>
+						<ashowConnectorName value="2"/>
+						<apaintThroughLabel value="2"/>
+						<ahasRoleAShape value="false"/>
+						<ahasRoleBShape value="false"/>
+						<ashowMultiplicityConstraints value="false"/>
+						<ahasMultiplicityAShape value="false"/>
+						<ahasMultiplicityBShape value="false"/>
+						<a0SwDr value="false"/>
+						<ashowStereotypes value="true"/>
+						<ashowFromRoleName value="true"/>
+						<ashowToRoleName value="true"/>
+						<ashowFromMultiplicity value="true"/>
+						<ashowToMultiplicity value="true"/>
+						<ashowFromRoleVisibility value="true"/>
+						<ashowToRoleVisibility value="true"/>
+						<ashowAssociationEndPropertyStrings value="false"/>
+						<ahasAssociationEndPropertyStringsAShape value="false"/>
+						<ahasAssociationEndPropertyStringsBShape value="false"/>
+						<afromRoleInternalWidth value="-2147483648"/>
+						<afromRoleInternalHeight value="-2147483648"/>
+						<atoRoleInternalWidth value="-2147483648"/>
+						<atoRoleInternalHeight value="-2147483648"/>
+						<afromMultiplicityInternalWidth value="-2147483648"/>
+						<afromMultiplicityInternalHeight value="-2147483648"/>
+						<atoMultiplicityInternalWidth value="-2147483648"/>
+						<atoMultiplicityInternalHeight value="-2147483648"/>
+						<aassociationEndPropertyStringsAInternalWidth value="-2147483648"/>
+						<aassociationEndPropertyStringsAInternalHeight value="-2147483648"/>
+						<aassociationEndPropertyStringsBInternalWidth value="-2147483648"/>
+						<aassociationEndPropertyStringsBInternalHeight value="-2147483648"/>
+					</properties>
+				</xmi:Extension>
+				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
+				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
+			</uml:DiagramElement>
+			<uml:DiagramElement geometry="720,140;720,329;" preferredShapeType="AssociationClass" subject="fUCTeuyCiu1SNwWy" xmi:id="fUCTeuyCiu1SNwWz">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<captionBounds value="727,294,20,0"/>
+					<captionInternalWidth value="-2147483648"/>
+					<captionInternalHeight value="-2147483648"/>
+					<captionVisible value="true"/>
+					<captionSide value="1"/>
+					<properties>
+						<abackground value="Cr:122,207,245,255"/>
+						<aforeground value="Cr:0,0,0,255"/>
+						<azOrder value="-1"/>
+						<aselectable value="true"/>
+						<arequestResetCaption value="false"/>
+						<arequestResetCaptionSize value="false"/>
+						<aconnectorStyle value="3"/>
+						<aconnectorLineJumps value="4"/>
+						<aconnectorLabelOrientation value="4"/>
+						<afromShapeXDiff value="0"/>
+						<afromShapeYDiff value="0"/>
+						<atoShapeXDiff value="0"/>
+						<atoShapeYDiff value="0"/>
+						<afromConnectType value="0"/>
+						<atoConnectType value="0"/>
+						<auseFromShapeCenter value="true"/>
+						<auseToShapeCenter value="true"/>
+						<afromPinType value="1"/>
+						<atoPinType value="1"/>
+						<arequestRebuild value="false"/>
+						<ashowConnectorName value="2"/>
+						<apaintThroughLabel value="2"/>
+					</properties>
+				</xmi:Extension>
+				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
+				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
+			</uml:DiagramElement>
+			<uml:DiagramElement geometry="160,80,80,100" preferredShapeType="Class" subject="m6xjmuyEwTiAAgLk" xmi:id="OaxjmuyEwTiAAgLj">
 				<xmi:Extension extender="Visual Paradigm for UML">
 					<captionBounds value="0,0,80,14"/>
 					<captionInternalWidth value="-2147483648"/>
@@ -8564,7 +9456,8 @@
 					<properties>
 						<abackground value="Cr:122,207,245,255"/>
 						<aforeground value="Cr:0,0,0,255"/>
-						<azOrder value="15"/>
+						<azOrder value="21"/>
+						<acreatorDiagramType value="ClassDiagram"/>
 						<aselectable value="true"/>
 						<arequestResetCaption value="false"/>
 						<arequestResetCaptionSize value="false"/>
@@ -8618,9 +9511,916 @@
 				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
 				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
 			</uml:DiagramElement>
-			<uml:DiagramElement geometry="420,139;420,100;480,100;480,165;440,165;" preferredShapeType="Association" subject="LrnLWuyEwTiAAggO" xmi:id="LrnLWuyEwTiAAggT">
-				<xmi:Extension extender="Visual Paradigm for UML">
-					<captionBounds value="450,80,108,14"/>
+			<uml:DiagramElement geometry="610,179;610,260;210,260;210,180;" preferredShapeType="Association" subject="wuw.WuyEwTiAAgYY" xmi:id="wuw.WuyEwTiAAgYd">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<captionBounds value="360,260,90,14"/>
+					<captionInternalWidth value="-2147483648"/>
+					<captionInternalHeight value="-2147483648"/>
+					<captionVisible value="true"/>
+					<captionSide value="1"/>
+					<roleB roleName="200,260,56,14"/>
+					<properties>
+						<abackground value="Cr:122,207,245,255"/>
+						<aforeground value="Cr:0,0,0,255"/>
+						<azOrder value="-1"/>
+						<acreatorDiagramType value="ClassDiagram"/>
+						<aselectable value="true"/>
+						<arequestResetCaption value="false"/>
+						<arequestResetCaptionSize value="false"/>
+						<aconnectorStyle value="3"/>
+						<aconnectorLineJumps value="4"/>
+						<aconnectorLabelOrientation value="4"/>
+						<afromShapeXDiff value="0"/>
+						<afromShapeYDiff value="0"/>
+						<atoShapeXDiff value="0"/>
+						<atoShapeYDiff value="0"/>
+						<afromConnectType value="0"/>
+						<atoConnectType value="0"/>
+						<auseFromShapeCenter value="true"/>
+						<auseToShapeCenter value="true"/>
+						<afromPinType value="1"/>
+						<atoPinType value="1"/>
+						<arequestRebuild value="false"/>
+						<ashowConnectorName value="2"/>
+						<apaintThroughLabel value="2"/>
+						<ahasRoleAShape value="false"/>
+						<ahasRoleBShape value="true"/>
+						<ashowMultiplicityConstraints value="false"/>
+						<aroleARectangle value="Re:530.0,290.0,40.0,20.0"/>
+						<aroleBRectangle value="Re:200.0,260.0,56.0,14.0"/>
+						<ahasMultiplicityAShape value="false"/>
+						<ahasMultiplicityBShape value="false"/>
+						<a0SwDr value="false"/>
+						<ashowStereotypes value="true"/>
+						<ashowFromRoleName value="true"/>
+						<ashowToRoleName value="true"/>
+						<ashowFromMultiplicity value="true"/>
+						<ashowToMultiplicity value="true"/>
+						<ashowFromRoleVisibility value="true"/>
+						<ashowToRoleVisibility value="true"/>
+						<ashowAssociationEndPropertyStrings value="false"/>
+						<ahasAssociationEndPropertyStringsAShape value="false"/>
+						<ahasAssociationEndPropertyStringsBShape value="false"/>
+						<afromRoleInternalWidth value="-2147483648"/>
+						<afromRoleInternalHeight value="-2147483648"/>
+						<atoRoleInternalWidth value="-2147483648"/>
+						<atoRoleInternalHeight value="-2147483648"/>
+						<afromMultiplicityInternalWidth value="-2147483648"/>
+						<afromMultiplicityInternalHeight value="-2147483648"/>
+						<atoMultiplicityInternalWidth value="-2147483648"/>
+						<atoMultiplicityInternalHeight value="-2147483648"/>
+						<aassociationEndPropertyStringsAInternalWidth value="-2147483648"/>
+						<aassociationEndPropertyStringsAInternalHeight value="-2147483648"/>
+						<aassociationEndPropertyStringsBInternalWidth value="-2147483648"/>
+						<aassociationEndPropertyStringsBInternalHeight value="-2147483648"/>
+					</properties>
+				</xmi:Extension>
+				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
+				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
+			</uml:DiagramElement>
+			<uml:DiagramElement geometry="450,260;450,410;450,539;" preferredShapeType="AssociationClass" subject="nOo.WuyEwTiAAgYg" xmi:id="XOo.WuyEwTiAAgYh">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<captionBounds value="455,532,20,0"/>
+					<captionInternalWidth value="-2147483648"/>
+					<captionInternalHeight value="-2147483648"/>
+					<captionVisible value="true"/>
+					<captionSide value="1"/>
+					<properties>
+						<abackground value="Cr:122,207,245,255"/>
+						<aforeground value="Cr:0,0,0,255"/>
+						<azOrder value="-1"/>
+						<aselectable value="true"/>
+						<arequestResetCaption value="false"/>
+						<arequestResetCaptionSize value="false"/>
+						<aconnectorStyle value="3"/>
+						<aconnectorLineJumps value="4"/>
+						<aconnectorLabelOrientation value="4"/>
+						<afromShapeXDiff value="0"/>
+						<afromShapeYDiff value="0"/>
+						<atoShapeXDiff value="0"/>
+						<atoShapeYDiff value="0"/>
+						<afromConnectType value="0"/>
+						<atoConnectType value="0"/>
+						<auseFromShapeCenter value="true"/>
+						<auseToShapeCenter value="true"/>
+						<afromPinType value="1"/>
+						<atoPinType value="1"/>
+						<arequestRebuild value="false"/>
+						<ashowConnectorName value="2"/>
+						<apaintThroughLabel value="2"/>
+					</properties>
+				</xmi:Extension>
+				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
+				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
+			</uml:DiagramElement>
+			<uml:DiagramElement geometry="590,150;240,150;" preferredShapeType="Association" subject="oXsuWuyEwTiAAgWq" xmi:id="YXsuWuyEwTiAAgWv">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<captionBounds value="370,135,45,14"/>
+					<captionInternalWidth value="-2147483648"/>
+					<captionInternalHeight value="-2147483648"/>
+					<captionVisible value="true"/>
+					<captionSide value="1"/>
+					<properties>
+						<abackground value="Cr:122,207,245,255"/>
+						<aforeground value="Cr:0,0,0,255"/>
+						<azOrder value="-1"/>
+						<acreatorDiagramType value="ClassDiagram"/>
+						<aselectable value="true"/>
+						<arequestResetCaption value="false"/>
+						<arequestResetCaptionSize value="false"/>
+						<aconnectorStyle value="3"/>
+						<aconnectorLineJumps value="4"/>
+						<aconnectorLabelOrientation value="4"/>
+						<afromShapeXDiff value="0"/>
+						<afromShapeYDiff value="0"/>
+						<atoShapeXDiff value="0"/>
+						<atoShapeYDiff value="0"/>
+						<afromConnectType value="0"/>
+						<atoConnectType value="0"/>
+						<auseFromShapeCenter value="true"/>
+						<auseToShapeCenter value="true"/>
+						<afromPinType value="1"/>
+						<atoPinType value="1"/>
+						<arequestRebuild value="false"/>
+						<ashowConnectorName value="2"/>
+						<apaintThroughLabel value="2"/>
+						<ahasRoleAShape value="false"/>
+						<ahasRoleBShape value="false"/>
+						<ashowMultiplicityConstraints value="false"/>
+						<ahasMultiplicityAShape value="false"/>
+						<ahasMultiplicityBShape value="false"/>
+						<a0SwDr value="false"/>
+						<ashowStereotypes value="true"/>
+						<ashowFromRoleName value="true"/>
+						<ashowToRoleName value="true"/>
+						<ashowFromMultiplicity value="true"/>
+						<ashowToMultiplicity value="true"/>
+						<ashowFromRoleVisibility value="true"/>
+						<ashowToRoleVisibility value="true"/>
+						<ashowAssociationEndPropertyStrings value="false"/>
+						<ahasAssociationEndPropertyStringsAShape value="false"/>
+						<ahasAssociationEndPropertyStringsBShape value="false"/>
+						<afromRoleInternalWidth value="-2147483648"/>
+						<afromRoleInternalHeight value="-2147483648"/>
+						<atoRoleInternalWidth value="-2147483648"/>
+						<atoRoleInternalHeight value="-2147483648"/>
+						<afromMultiplicityInternalWidth value="-2147483648"/>
+						<afromMultiplicityInternalHeight value="-2147483648"/>
+						<atoMultiplicityInternalWidth value="-2147483648"/>
+						<atoMultiplicityInternalHeight value="-2147483648"/>
+						<aassociationEndPropertyStringsAInternalWidth value="-2147483648"/>
+						<aassociationEndPropertyStringsAInternalHeight value="-2147483648"/>
+						<aassociationEndPropertyStringsBInternalWidth value="-2147483648"/>
+						<aassociationEndPropertyStringsBInternalHeight value="-2147483648"/>
+					</properties>
+				</xmi:Extension>
+				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
+				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
+			</uml:DiagramElement>
+			<uml:DiagramElement geometry="250,150;250,329;" preferredShapeType="AssociationClass" subject="MDhNWuyEwTiAAgc4" xmi:id="MDhNWuyEwTiAAgc5">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<captionBounds value="260,271,20,0"/>
+					<captionInternalWidth value="-2147483648"/>
+					<captionInternalHeight value="-2147483648"/>
+					<captionVisible value="true"/>
+					<captionSide value="1"/>
+					<properties>
+						<abackground value="Cr:122,207,245,255"/>
+						<aforeground value="Cr:0,0,0,255"/>
+						<azOrder value="-1"/>
+						<aselectable value="true"/>
+						<arequestResetCaption value="false"/>
+						<arequestResetCaptionSize value="false"/>
+						<aconnectorStyle value="3"/>
+						<aconnectorLineJumps value="4"/>
+						<aconnectorLabelOrientation value="4"/>
+						<afromShapeXDiff value="0"/>
+						<afromShapeYDiff value="0"/>
+						<atoShapeXDiff value="0"/>
+						<atoShapeYDiff value="0"/>
+						<afromConnectType value="0"/>
+						<atoConnectType value="0"/>
+						<auseFromShapeCenter value="true"/>
+						<auseToShapeCenter value="true"/>
+						<afromPinType value="1"/>
+						<atoPinType value="1"/>
+						<arequestRebuild value="false"/>
+						<ashowConnectorName value="2"/>
+						<apaintThroughLabel value="2"/>
+					</properties>
+				</xmi:Extension>
+				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
+				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
+			</uml:DiagramElement>
+			<uml:DiagramElement geometry="590,110;240,110;" preferredShapeType="Association" subject="WzlMWuyEwTiAAgT6" xmi:id="2zlMWuyEwTiAAgT_">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<captionBounds value="368,95,107,14"/>
+					<captionInternalWidth value="-2147483648"/>
+					<captionInternalHeight value="-2147483648"/>
+					<captionVisible value="true"/>
+					<captionSide value="1"/>
+					<properties>
+						<abackground value="Cr:122,207,245,255"/>
+						<aforeground value="Cr:0,0,0,255"/>
+						<azOrder value="-1"/>
+						<acreatorDiagramType value="ClassDiagram"/>
+						<aselectable value="true"/>
+						<arequestResetCaption value="false"/>
+						<arequestResetCaptionSize value="false"/>
+						<aconnectorStyle value="3"/>
+						<aconnectorLineJumps value="4"/>
+						<aconnectorLabelOrientation value="4"/>
+						<afromShapeXDiff value="0"/>
+						<afromShapeYDiff value="0"/>
+						<atoShapeXDiff value="0"/>
+						<atoShapeYDiff value="0"/>
+						<afromConnectType value="0"/>
+						<atoConnectType value="0"/>
+						<auseFromShapeCenter value="true"/>
+						<auseToShapeCenter value="true"/>
+						<afromPinType value="1"/>
+						<atoPinType value="1"/>
+						<arequestRebuild value="false"/>
+						<ashowConnectorName value="2"/>
+						<apaintThroughLabel value="2"/>
+						<ahasRoleAShape value="false"/>
+						<ahasRoleBShape value="false"/>
+						<ashowMultiplicityConstraints value="false"/>
+						<ahasMultiplicityAShape value="false"/>
+						<ahasMultiplicityBShape value="false"/>
+						<a0SwDr value="false"/>
+						<ashowStereotypes value="true"/>
+						<ashowFromRoleName value="true"/>
+						<ashowToRoleName value="true"/>
+						<ashowFromMultiplicity value="true"/>
+						<ashowToMultiplicity value="true"/>
+						<ashowFromRoleVisibility value="true"/>
+						<ashowToRoleVisibility value="true"/>
+						<ashowAssociationEndPropertyStrings value="false"/>
+						<ahasAssociationEndPropertyStringsAShape value="false"/>
+						<ahasAssociationEndPropertyStringsBShape value="false"/>
+						<afromRoleInternalWidth value="-2147483648"/>
+						<afromRoleInternalHeight value="-2147483648"/>
+						<atoRoleInternalWidth value="-2147483648"/>
+						<atoRoleInternalHeight value="-2147483648"/>
+						<afromMultiplicityInternalWidth value="-2147483648"/>
+						<afromMultiplicityInternalHeight value="-2147483648"/>
+						<atoMultiplicityInternalWidth value="-2147483648"/>
+						<atoMultiplicityInternalHeight value="-2147483648"/>
+						<aassociationEndPropertyStringsAInternalWidth value="-2147483648"/>
+						<aassociationEndPropertyStringsAInternalHeight value="-2147483648"/>
+						<aassociationEndPropertyStringsBInternalWidth value="-2147483648"/>
+						<aassociationEndPropertyStringsBInternalHeight value="-2147483648"/>
+					</properties>
+				</xmi:Extension>
+				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
+				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
+			</uml:DiagramElement>
+			<uml:DiagramElement geometry="340,110;340,329;" preferredShapeType="AssociationClass" subject="fPPNWuyEwTiAAgdW" xmi:id="fPPNWuyEwTiAAgdX">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<captionBounds value="351,281,20,0"/>
+					<captionInternalWidth value="-2147483648"/>
+					<captionInternalHeight value="-2147483648"/>
+					<captionVisible value="true"/>
+					<captionSide value="1"/>
+					<properties>
+						<abackground value="Cr:122,207,245,255"/>
+						<aforeground value="Cr:0,0,0,255"/>
+						<azOrder value="-1"/>
+						<aselectable value="true"/>
+						<arequestResetCaption value="false"/>
+						<arequestResetCaptionSize value="false"/>
+						<aconnectorStyle value="3"/>
+						<aconnectorLineJumps value="4"/>
+						<aconnectorLabelOrientation value="4"/>
+						<afromShapeXDiff value="0"/>
+						<afromShapeYDiff value="0"/>
+						<atoShapeXDiff value="0"/>
+						<atoShapeYDiff value="0"/>
+						<afromConnectType value="0"/>
+						<atoConnectType value="0"/>
+						<auseFromShapeCenter value="true"/>
+						<auseToShapeCenter value="true"/>
+						<afromPinType value="1"/>
+						<atoPinType value="1"/>
+						<arequestRebuild value="false"/>
+						<ashowConnectorName value="2"/>
+						<apaintThroughLabel value="2"/>
+					</properties>
+				</xmi:Extension>
+				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
+				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
+			</uml:DiagramElement>
+			<uml:DiagramElement geometry="620,179;620,280;180,280;180,180;" preferredShapeType="Association" subject="f1p0WuyEwTiAAgTE" xmi:id="_1p0WuyEwTiAAgTJ">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<captionBounds value="360,280,85,14"/>
+					<captionInternalWidth value="-2147483648"/>
+					<captionInternalHeight value="-2147483648"/>
+					<captionVisible value="true"/>
+					<captionSide value="1"/>
+					<roleB roleName="167,282,56,14"/>
+					<properties>
+						<abackground value="Cr:122,207,245,255"/>
+						<aforeground value="Cr:0,0,0,255"/>
+						<azOrder value="-1"/>
+						<acreatorDiagramType value="ClassDiagram"/>
+						<aselectable value="true"/>
+						<arequestResetCaption value="false"/>
+						<arequestResetCaptionSize value="false"/>
+						<aconnectorStyle value="3"/>
+						<aconnectorLineJumps value="4"/>
+						<aconnectorLabelOrientation value="4"/>
+						<afromShapeXDiff value="0"/>
+						<afromShapeYDiff value="0"/>
+						<atoShapeXDiff value="0"/>
+						<atoShapeYDiff value="0"/>
+						<afromConnectType value="0"/>
+						<atoConnectType value="0"/>
+						<auseFromShapeCenter value="true"/>
+						<auseToShapeCenter value="true"/>
+						<afromPinType value="1"/>
+						<atoPinType value="1"/>
+						<arequestRebuild value="false"/>
+						<ashowConnectorName value="2"/>
+						<apaintThroughLabel value="2"/>
+						<ahasRoleAShape value="false"/>
+						<ahasRoleBShape value="true"/>
+						<ashowMultiplicityConstraints value="false"/>
+						<aroleBRectangle value="Re:167.0,282.0,56.0,14.0"/>
+						<ahasMultiplicityAShape value="false"/>
+						<ahasMultiplicityBShape value="false"/>
+						<a0SwDr value="false"/>
+						<ashowStereotypes value="true"/>
+						<ashowFromRoleName value="true"/>
+						<ashowToRoleName value="true"/>
+						<ashowFromMultiplicity value="true"/>
+						<ashowToMultiplicity value="true"/>
+						<ashowFromRoleVisibility value="true"/>
+						<ashowToRoleVisibility value="true"/>
+						<ashowAssociationEndPropertyStrings value="false"/>
+						<ahasAssociationEndPropertyStringsAShape value="false"/>
+						<ahasAssociationEndPropertyStringsBShape value="false"/>
+						<afromRoleInternalWidth value="-2147483648"/>
+						<afromRoleInternalHeight value="-2147483648"/>
+						<atoRoleInternalWidth value="-2147483648"/>
+						<atoRoleInternalHeight value="-2147483648"/>
+						<afromMultiplicityInternalWidth value="-2147483648"/>
+						<afromMultiplicityInternalHeight value="-2147483648"/>
+						<atoMultiplicityInternalWidth value="-2147483648"/>
+						<atoMultiplicityInternalHeight value="-2147483648"/>
+						<aassociationEndPropertyStringsAInternalWidth value="-2147483648"/>
+						<aassociationEndPropertyStringsAInternalHeight value="-2147483648"/>
+						<aassociationEndPropertyStringsBInternalWidth value="-2147483648"/>
+						<aassociationEndPropertyStringsBInternalHeight value="-2147483648"/>
+					</properties>
+				</xmi:Extension>
+				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
+				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
+			</uml:DiagramElement>
+			<uml:DiagramElement geometry="290,280;290,539;" preferredShapeType="AssociationClass" subject="9G50WuyEwTiAAgTM" xmi:id="9G50WuyEwTiAAgTN">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<captionBounds value="206,506,20,0"/>
+					<captionInternalWidth value="-2147483648"/>
+					<captionInternalHeight value="-2147483648"/>
+					<captionVisible value="true"/>
+					<captionSide value="1"/>
+					<properties>
+						<abackground value="Cr:122,207,245,255"/>
+						<aforeground value="Cr:0,0,0,255"/>
+						<azOrder value="-1"/>
+						<aselectable value="true"/>
+						<arequestResetCaption value="false"/>
+						<arequestResetCaptionSize value="false"/>
+						<aconnectorStyle value="3"/>
+						<aconnectorLineJumps value="4"/>
+						<aconnectorLabelOrientation value="4"/>
+						<afromShapeXDiff value="0"/>
+						<afromShapeYDiff value="0"/>
+						<atoShapeXDiff value="0"/>
+						<atoShapeYDiff value="0"/>
+						<afromConnectType value="0"/>
+						<atoConnectType value="0"/>
+						<auseFromShapeCenter value="true"/>
+						<auseToShapeCenter value="true"/>
+						<afromPinType value="1"/>
+						<atoPinType value="1"/>
+						<arequestRebuild value="false"/>
+						<ashowConnectorName value="2"/>
+						<apaintThroughLabel value="2"/>
+					</properties>
+				</xmi:Extension>
+				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
+				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
+			</uml:DiagramElement>
+			<uml:DiagramElement geometry="230,180;230,240;600,240;600,179;" preferredShapeType="Association" subject="JsssWuyEwTiAAgU5" xmi:id="psssWuyEwTiAAgU.">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<captionBounds value="360,240,111,14"/>
+					<captionInternalWidth value="-2147483648"/>
+					<captionInternalHeight value="-2147483648"/>
+					<captionVisible value="true"/>
+					<captionSide value="1"/>
+					<properties>
+						<abackground value="Cr:122,207,245,255"/>
+						<aforeground value="Cr:0,0,0,255"/>
+						<azOrder value="-1"/>
+						<acreatorDiagramType value="ClassDiagram"/>
+						<aselectable value="true"/>
+						<arequestResetCaption value="false"/>
+						<arequestResetCaptionSize value="false"/>
+						<aconnectorStyle value="3"/>
+						<aconnectorLineJumps value="4"/>
+						<aconnectorLabelOrientation value="4"/>
+						<afromShapeXDiff value="0"/>
+						<afromShapeYDiff value="0"/>
+						<atoShapeXDiff value="0"/>
+						<atoShapeYDiff value="0"/>
+						<afromConnectType value="0"/>
+						<atoConnectType value="0"/>
+						<auseFromShapeCenter value="true"/>
+						<auseToShapeCenter value="true"/>
+						<afromPinType value="1"/>
+						<atoPinType value="1"/>
+						<arequestRebuild value="false"/>
+						<ashowConnectorName value="2"/>
+						<apaintThroughLabel value="2"/>
+						<ahasRoleAShape value="false"/>
+						<ahasRoleBShape value="false"/>
+						<ashowMultiplicityConstraints value="false"/>
+						<aroleBRectangle value="Re:520.0,260.0,26.0,14.0"/>
+						<amultiplicityBRectangle value="Re:480.0,210.0,42.0,14.0"/>
+						<ahasMultiplicityAShape value="false"/>
+						<ahasMultiplicityBShape value="false"/>
+						<a0SwDr value="false"/>
+						<ashowStereotypes value="true"/>
+						<ashowFromRoleName value="true"/>
+						<ashowToRoleName value="true"/>
+						<ashowFromMultiplicity value="true"/>
+						<ashowToMultiplicity value="true"/>
+						<ashowFromRoleVisibility value="true"/>
+						<ashowToRoleVisibility value="true"/>
+						<ashowAssociationEndPropertyStrings value="false"/>
+						<ahasAssociationEndPropertyStringsAShape value="false"/>
+						<ahasAssociationEndPropertyStringsBShape value="false"/>
+						<afromRoleInternalWidth value="-2147483648"/>
+						<afromRoleInternalHeight value="-2147483648"/>
+						<atoRoleInternalWidth value="-2147483648"/>
+						<atoRoleInternalHeight value="-2147483648"/>
+						<afromMultiplicityInternalWidth value="-2147483648"/>
+						<afromMultiplicityInternalHeight value="-2147483648"/>
+						<atoMultiplicityInternalWidth value="-2147483648"/>
+						<atoMultiplicityInternalHeight value="-2147483648"/>
+						<aassociationEndPropertyStringsAInternalWidth value="-2147483648"/>
+						<aassociationEndPropertyStringsAInternalHeight value="-2147483648"/>
+						<aassociationEndPropertyStringsBInternalWidth value="-2147483648"/>
+						<aassociationEndPropertyStringsBInternalHeight value="-2147483648"/>
+					</properties>
+				</xmi:Extension>
+				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
+				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
+			</uml:DiagramElement>
+			<uml:DiagramElement geometry="520,240;520,329;" preferredShapeType="AssociationClass" subject="i8MtWuyEwTiAAgdo" xmi:id="i8MtWuyEwTiAAgdp">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<captionBounds value="530,320,20,0"/>
+					<captionInternalWidth value="-2147483648"/>
+					<captionInternalHeight value="-2147483648"/>
+					<captionVisible value="true"/>
+					<captionSide value="1"/>
+					<properties>
+						<abackground value="Cr:122,207,245,255"/>
+						<aforeground value="Cr:0,0,0,255"/>
+						<azOrder value="-1"/>
+						<aselectable value="true"/>
+						<arequestResetCaption value="false"/>
+						<arequestResetCaptionSize value="false"/>
+						<aconnectorStyle value="3"/>
+						<aconnectorLineJumps value="4"/>
+						<aconnectorLabelOrientation value="4"/>
+						<afromShapeXDiff value="0"/>
+						<afromShapeYDiff value="0"/>
+						<atoShapeXDiff value="0"/>
+						<atoShapeYDiff value="0"/>
+						<afromConnectType value="0"/>
+						<atoConnectType value="0"/>
+						<auseFromShapeCenter value="true"/>
+						<auseToShapeCenter value="true"/>
+						<afromPinType value="1"/>
+						<atoPinType value="1"/>
+						<arequestRebuild value="false"/>
+						<ashowConnectorName value="2"/>
+						<apaintThroughLabel value="2"/>
+					</properties>
+				</xmi:Extension>
+				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
+				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
+			</uml:DiagramElement>
+			<uml:DiagramElement geometry="112,51,609,161" preferredShapeType="SECurveShape" subject="24s2HuyCiu1SNxHD" xmi:id="24s2HuyCiu1SNxHC">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<captionBounds value="0,0,40,40"/>
+					<captionInternalWidth value="-2147483648"/>
+					<captionInternalHeight value="-2147483648"/>
+					<captionVisible value="false"/>
+					<captionSide value="7"/>
+					<properties>
+						<abackground value="Cr:255,255,192,127"/>
+						<aforeground value="Cr:192,192,192,255"/>
+						<azOrder value="26"/>
+						<aselectable value="true"/>
+						<arequestResetCaption value="false"/>
+						<arequestResetCaptionSize value="false"/>
+						<adisplayStereotypeIcon value="false"/>
+						<aoverrideAppearanceWithStereotypeIcon value="true"/>
+						<arequestSetSizeOption value="0"/>
+						<aparentConnectorHeaderLength value="40"/>
+						<aparentConnectorLineLength value="10"/>
+						<aconnectToPoint value="true"/>
+						<aparentConnectorDTheta value="0.0"/>
+						<aconnectionPointType value="2"/>
+						<amodelElementNameAlignment value="9"/>
+						<arequestDefaultSize value="false"/>
+						<arequestFitSize value="false"/>
+						<arequestFitSizeFromCenter value="false"/>
+						<aobjectId value="28"/>
+						<aobjectType value="9096"/>
+						<anotUseVisibleBounds value="false"/>
+						<aalpha value="1.0"/>
+						<arotateAngle value="0.0"/>
+						<anodeName value="VPCurveShape"/>
+						<aactConnector value="true"/>
+						<adrawBy value="3"/>
+					</properties>
+					<FontFormat fontColor="Cr:0,0,0,255">
+						<Font name="Dialog" size="11" style="0"/>
+					</FontFormat>
+					<Label location="Pt:416.5,131.5" text=""/>
+					<Label transparency="0" tx="0.0" ty="0.0" type="0">
+						<FillFormat renderStyle="1">
+							<AffineTransformMatrix>
+								<Matrix value="1.003454231433506"/>
+								<Matrix value="0.0"/>
+								<Matrix value="0.0"/>
+								<Matrix value="0.8012048192771086"/>
+								<Matrix value="30.67184801381704"/>
+								<Matrix value="28.94578313253015"/>
+							</AffineTransformMatrix>
+							<Render color="Cr:0,0,0,255"/>
+						</FillFormat>
+					</Label>
+					<ShapeBasePoint point="Pt:416.5,131.5"/>
+					<Arrow endArrow="0" startArrow="0"/>
+					<LineFormat color="Cr:192,192,192,255" style="91" width="1.0">
+						<Stroke cap="0" dashPhase="0.0" join="0" miterlimit="10.0" type="0" width="1.0"/>
+					</LineFormat>
+					<FillFormat renderStyle="1">
+						<AffineTransformMatrix>
+							<Matrix value="1.003454231433506"/>
+							<Matrix value="0.0"/>
+							<Matrix value="0.0"/>
+							<Matrix value="0.8012048192771086"/>
+							<Matrix value="30.67184801381704"/>
+							<Matrix value="28.94578313253015"/>
+						</AffineTransformMatrix>
+						<Render color="Cr:255,255,192,127"/>
+					</FillFormat>
+					<CurveList windingRule="1">
+						<Curves>
+							<Curve controlPoint1="Pt:271.25,65.0" controlPoint2="Pt:561.75,65.0" endPoint="Pt:707.0,65.0" objectId="1" startPoint="Pt:126.0,65.0"/>
+							<Curve controlPoint1="Pt:707.0,98.25" controlPoint2="Pt:707.0,164.75" endPoint="Pt:707.0,198.0" objectId="2" startPoint="Pt:707.0,65.0"/>
+							<Curve controlPoint1="Pt:561.75,198.0" controlPoint2="Pt:271.25,198.0" endPoint="Pt:126.0,198.0" objectId="3" startPoint="Pt:707.0,198.0"/>
+							<Curve controlPoint1="Pt:126.0,164.75" controlPoint2="Pt:126.0,98.25" endPoint="Pt:126.0,65.0" objectId="4" startPoint="Pt:126.0,198.0"/>
+						</Curves>
+					</CurveList>
+				</xmi:Extension>
+				<elementFill color1="Cr:255,255,192,127" color2="" style="1" transparency="50" type="1"/>
+				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
+				<elementLine color="Cr:192,192,192,255" style="1" transparency="0" weight="1.0"/>
+			</uml:DiagramElement>
+			<uml:DiagramElement geometry="6,260,159,71" preferredShapeType="NOTE" subject="afB2HuyCiu1SNxHe" xmi:id="yfB2HuyCiu1SNxHd">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<captionBounds value="0,0,159,0"/>
+					<captionInternalWidth value="-2147483648"/>
+					<captionInternalHeight value="-2147483648"/>
+					<captionVisible value="true"/>
+					<captionSide value="12"/>
+					<properties>
+						<abackground value="Cr:255,255,192,255"/>
+						<aforeground value="Cr:0,0,0,255"/>
+						<azOrder value="0"/>
+						<acreatorDiagramType value="ClassDiagram"/>
+						<aselectable value="true"/>
+						<arequestResetCaption value="false"/>
+						<arequestResetCaptionSize value="false"/>
+						<adisplayStereotypeIcon value="false"/>
+						<aoverrideAppearanceWithStereotypeIcon value="true"/>
+						<arequestSetSizeOption value="0"/>
+						<aparentConnectorHeaderLength value="40"/>
+						<aparentConnectorLineLength value="10"/>
+						<aconnectToPoint value="true"/>
+						<aparentConnectorDTheta value="0.0"/>
+						<aconnectionPointType value="2"/>
+						<amodelElementNameAlignment value="9"/>
+						<arequestDefaultSize value="false"/>
+						<arequestFitSize value="false"/>
+						<arequestFitSizeFromCenter value="false"/>
+						<aangle value="0"/>
+					</properties>
+				</xmi:Extension>
+				<elementFill color1="Cr:255,255,192,127" color2="" style="1" transparency="50" type="1"/>
+				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
+				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
+			</uml:DiagramElement>
+			<uml:DiagramElement geometry="148,259;148,212;" preferredShapeType="Anchor" subject="EOr2HuyCiu1SNxHr" xmi:id="Yur2HuyCiu1SNxHs">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<captionBounds value="158,271,20,0"/>
+					<captionInternalWidth value="-2147483648"/>
+					<captionInternalHeight value="-2147483648"/>
+					<captionVisible value="true"/>
+					<captionSide value="1"/>
+					<properties>
+						<abackground value="Cr:122,207,245,255"/>
+						<aforeground value="Cr:0,0,0,255"/>
+						<azOrder value="-1"/>
+						<acreatorDiagramType value="ClassDiagram"/>
+						<aselectable value="true"/>
+						<arequestResetCaption value="false"/>
+						<arequestResetCaptionSize value="false"/>
+						<aconnectorStyle value="3"/>
+						<aconnectorLineJumps value="4"/>
+						<aconnectorLabelOrientation value="4"/>
+						<afromShapeXDiff value="0"/>
+						<afromShapeYDiff value="0"/>
+						<atoShapeXDiff value="0"/>
+						<atoShapeYDiff value="0"/>
+						<afromConnectType value="0"/>
+						<atoConnectType value="0"/>
+						<auseFromShapeCenter value="true"/>
+						<auseToShapeCenter value="true"/>
+						<afromPinType value="1"/>
+						<atoPinType value="1"/>
+						<arequestRebuild value="false"/>
+						<ashowConnectorName value="2"/>
+						<apaintThroughLabel value="2"/>
+					</properties>
+				</xmi:Extension>
+				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
+				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
+			</uml:DiagramElement>
+			<uml:DiagramElement geometry="235,390;320,457;" preferredShapeType="Association" subject="eWBu3uyCiu1SNxXO" xmi:id=".WBu3uyCiu1SNxXT">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<captionBounds value="197,401,44,14"/>
+					<captionInternalWidth value="-2147483648"/>
+					<captionInternalHeight value="-2147483648"/>
+					<captionVisible value="true"/>
+					<captionSide value="1"/>
+					<properties>
+						<abackground value="Cr:122,207,245,255"/>
+						<aforeground value="Cr:0,0,0,255"/>
+						<azOrder value="-1"/>
+						<acreatorDiagramType value="ClassDiagram"/>
+						<aselectable value="true"/>
+						<arequestResetCaption value="false"/>
+						<arequestResetCaptionSize value="false"/>
+						<aconnectorStyle value="3"/>
+						<aconnectorLineJumps value="4"/>
+						<aconnectorLabelOrientation value="4"/>
+						<afromShapeXDiff value="0"/>
+						<afromShapeYDiff value="0"/>
+						<atoShapeXDiff value="0"/>
+						<atoShapeYDiff value="0"/>
+						<afromConnectType value="0"/>
+						<atoConnectType value="0"/>
+						<auseFromShapeCenter value="true"/>
+						<auseToShapeCenter value="true"/>
+						<afromPinType value="1"/>
+						<atoPinType value="2"/>
+						<atoPinRatio value="Pt:0.0,0.42500001192092896"/>
+						<arequestRebuild value="false"/>
+						<ashowConnectorName value="2"/>
+						<apaintThroughLabel value="2"/>
+						<ahasRoleAShape value="false"/>
+						<ahasRoleBShape value="false"/>
+						<ashowMultiplicityConstraints value="false"/>
+						<ahasMultiplicityAShape value="false"/>
+						<ahasMultiplicityBShape value="false"/>
+						<a0SwDr value="false"/>
+						<ashowStereotypes value="true"/>
+						<ashowFromRoleName value="true"/>
+						<ashowToRoleName value="true"/>
+						<ashowFromMultiplicity value="true"/>
+						<ashowToMultiplicity value="true"/>
+						<ashowFromRoleVisibility value="true"/>
+						<ashowToRoleVisibility value="true"/>
+						<ashowAssociationEndPropertyStrings value="false"/>
+						<ahasAssociationEndPropertyStringsAShape value="false"/>
+						<ahasAssociationEndPropertyStringsBShape value="false"/>
+						<afromRoleInternalWidth value="-2147483648"/>
+						<afromRoleInternalHeight value="-2147483648"/>
+						<atoRoleInternalWidth value="-2147483648"/>
+						<atoRoleInternalHeight value="-2147483648"/>
+						<afromMultiplicityInternalWidth value="-2147483648"/>
+						<afromMultiplicityInternalHeight value="-2147483648"/>
+						<atoMultiplicityInternalWidth value="-2147483648"/>
+						<atoMultiplicityInternalHeight value="-2147483648"/>
+						<aassociationEndPropertyStringsAInternalWidth value="-2147483648"/>
+						<aassociationEndPropertyStringsAInternalHeight value="-2147483648"/>
+						<aassociationEndPropertyStringsBInternalWidth value="-2147483648"/>
+						<aassociationEndPropertyStringsBInternalHeight value="-2147483648"/>
+					</properties>
+				</xmi:Extension>
+				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
+				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
+			</uml:DiagramElement>
+		</uml:Diagram.element>
+	</uml:Diagram>
+	<uml:Diagram diagramType="ClassDiagram" documentation="" name="Component3" toolName="Visual Paradigm for UML" xmi:id="VRALWuyEwTiAAges">
+		<xmi:Extension extender="Visual Paradigm for UML">
+			<properties>
+				<apmAuthor value="lavm"/>
+				<apmCreateDateTime value="1337258412202"/>
+				<apmLastModified value="1337806318874"/>
+				<ashowPackageNameStyle value="0"/>
+				<ashowConnectorName value="0"/>
+				<apaintConnectorThroughLabel value="0"/>
+				<ashowActivityStateNodeCaption value="65535"/>
+				<aeditable value="true"/>
+				<afollowDiagramParentElement value="true"/>
+				<aautoFitShapesSize value="false"/>
+				<ashowTaggedValues value="false"/>
+				<ashowStereotypes value="true"/>
+				<ashowConstraints value="false"/>
+				<aalignToGrid value="false"/>
+				<agridVisible value="false"/>
+				<agridWidth value="10"/>
+				<agridHeight value="10"/>
+				<agridColor value="Cr:192,192,192,255"/>
+				<adiagramBackground value="Cr:255,255,255,255"/>
+				<aconnectorStyle value="1"/>
+				<aconnectorLineJumps value="0"/>
+				<aconnectorLineJumpsSize value="0"/>
+				<aconnectionPointStyle value="0"/>
+				<aconnectorLabelOrientation value="0"/>
+				<amodelElementNameAlignment value="4"/>
+				<azoomRatio value="1.0"/>
+				<amaximized value="true"/>
+				<ax value="0"/>
+				<ay value="0"/>
+				<awidth value="1235"/>
+				<aheight value="653"/>
+				<aqualityScore value="-1"/>
+				<aparentModel value="WzQLWuyEwTiAAgey"/>
+				<a_globalPaletteOption value="true"/>
+				<a_alwaysShowReferenceAndSubdiagramResource value="false"/>
+				<ainitializeDiagramForCreate value="true"/>
+				<arequestValidateSnapToGrid value="false"/>
+				<ashowDefaultPackage value="true"/>
+				<adefaultPackage value="WzQLWuyEwTiAAgey"/>
+				<ashowAttributeGetterSetter value="false"/>
+				<ashowClassOwner value="2"/>
+				<ashowPackageOwner value="2"/>
+				<ashowTemplateInfoOfGeneralizationAndRealization value="false"/>
+				<asuppressImplied1MultiplicityForAttributeAndAssociationEnd value="false"/>
+				<ashowClassEmptyCompartments value="2"/>
+				<ashowAttributesCodeDetails value="2"/>
+				<ashowAttributesType value="1"/>
+				<ashowOperationsParameters value="1"/>
+				<ashowOperationsReturnType value="1"/>
+				<ashowOperationsCodeDetails value="2"/>
+				<ashowParametersCodeDetails value="2"/>
+				<ashowEllipsisForUnshownClassMembers value="2"/>
+				<ageneralizationSetNotation value="2"/>
+			</properties>
+		</xmi:Extension>
+		<uml:Diagram.element>
+			<uml:DiagramElement geometry="700,110,80,80" preferredShapeType="Class" subject="vTljmuyEwTiAAgLp" xmi:id="7rBLWuyEwTiAAgfZ">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<captionBounds value="0,0,80,14"/>
+					<captionInternalWidth value="-2147483648"/>
+					<captionInternalHeight value="-2147483648"/>
+					<captionVisible value="true"/>
+					<captionSide value="12"/>
+					<properties>
+						<abackground value="Cr:122,207,245,255"/>
+						<aforeground value="Cr:0,0,0,255"/>
+						<azOrder value="20"/>
+						<aselectable value="true"/>
+						<arequestResetCaption value="false"/>
+						<arequestResetCaptionSize value="false"/>
+						<adisplayStereotypeIcon value="false"/>
+						<aoverrideAppearanceWithStereotypeIcon value="true"/>
+						<arequestSetSizeOption value="0"/>
+						<aparentConnectorHeaderLength value="40"/>
+						<aparentConnectorLineLength value="10"/>
+						<aconnectToPoint value="true"/>
+						<aparentConnectorDTheta value="0.0"/>
+						<aconnectionPointType value="2"/>
+						<amodelElementNameAlignment value="9"/>
+						<arequestDefaultSize value="false"/>
+						<arequestFitSize value="false"/>
+						<arequestFitSizeFromCenter value="false"/>
+						<adisplayAsRobustnessAnalysisIcon value="true"/>
+						<avisibilityStyle value="1"/>
+						<ashowAttributeType value="1"/>
+						<ashowOperationType value="1"/>
+						<amSwTpPts value="true"/>
+						<alshRfAts value="true"/>
+						<amShDrAt value="false"/>
+						<akShDrOp value="false"/>
+						<akSwCsMbSt value="true"/>
+						<ashowClassMemberConstraints value="true"/>
+						<alShCmMl value="false"/>
+						<ashowOperationParameterDirection value="false"/>
+						<ashowOperationRaisedExceptions value="false"/>
+						<ashowParameterNameInOperationSignature value="true"/>
+						<ashowOperationTemplateParameters value="false"/>
+						<ashowOperationProperties value="false"/>
+						<awpMbs value="false"/>
+						<aattributeSortType value="0"/>
+						<aoperationSortType value="0"/>
+						<ashowInitialAttributeValue value="true"/>
+						<ashowOperationSignature value="true"/>
+						<ainterfaceBall value="false"/>
+						<ashowEmptyCompartments value="0"/>
+						<ashowEllipsisForUnshownMembers value="0"/>
+						<ashowAttributesCodeDetails value="0"/>
+						<ashowOperationsCodeDetails value="0"/>
+						<ashowParametersCodeDetails value="0"/>
+						<ashowTypeOption value="0"/>
+						<ashowOwnerOption value="3"/>
+						<ashowAttributesType value="0"/>
+						<ashowOperationsParameters value="0"/>
+						<ashowOperationsReturnType value="0"/>
+					</properties>
+				</xmi:Extension>
+				<elementFill color1="Cr:122,207,245,255" color2="" style="1" transparency="0" type="1"/>
+				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
+				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
+			</uml:DiagramElement>
+			<uml:DiagramElement geometry="360,132,80,59" preferredShapeType="Class" subject="m6xjmuyEwTiAAgLk" xmi:id="B3VLWuyEwTiAAgfm">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<captionBounds value="0,0,80,14"/>
+					<captionInternalWidth value="-2147483648"/>
+					<captionInternalHeight value="-2147483648"/>
+					<captionVisible value="true"/>
+					<captionSide value="12"/>
+					<properties>
+						<abackground value="Cr:122,207,245,255"/>
+						<aforeground value="Cr:0,0,0,255"/>
+						<azOrder value="18"/>
+						<aselectable value="true"/>
+						<arequestResetCaption value="false"/>
+						<arequestResetCaptionSize value="false"/>
+						<adisplayStereotypeIcon value="false"/>
+						<aoverrideAppearanceWithStereotypeIcon value="true"/>
+						<arequestSetSizeOption value="0"/>
+						<aparentConnectorHeaderLength value="40"/>
+						<aparentConnectorLineLength value="10"/>
+						<aconnectToPoint value="true"/>
+						<aparentConnectorDTheta value="0.0"/>
+						<aconnectionPointType value="2"/>
+						<amodelElementNameAlignment value="9"/>
+						<arequestDefaultSize value="false"/>
+						<arequestFitSize value="false"/>
+						<arequestFitSizeFromCenter value="false"/>
+						<adisplayAsRobustnessAnalysisIcon value="true"/>
+						<avisibilityStyle value="1"/>
+						<ashowAttributeType value="1"/>
+						<ashowOperationType value="1"/>
+						<amSwTpPts value="true"/>
+						<alshRfAts value="true"/>
+						<amShDrAt value="false"/>
+						<akShDrOp value="false"/>
+						<akSwCsMbSt value="true"/>
+						<ashowClassMemberConstraints value="true"/>
+						<alShCmMl value="false"/>
+						<ashowOperationParameterDirection value="false"/>
+						<ashowOperationRaisedExceptions value="false"/>
+						<ashowParameterNameInOperationSignature value="true"/>
+						<ashowOperationTemplateParameters value="false"/>
+						<ashowOperationProperties value="false"/>
+						<awpMbs value="false"/>
+						<aattributeSortType value="0"/>
+						<aoperationSortType value="0"/>
+						<ashowInitialAttributeValue value="true"/>
+						<ashowOperationSignature value="true"/>
+						<ainterfaceBall value="false"/>
+						<ashowEmptyCompartments value="0"/>
+						<ashowEllipsisForUnshownMembers value="0"/>
+						<ashowAttributesCodeDetails value="0"/>
+						<ashowOperationsCodeDetails value="0"/>
+						<ashowParametersCodeDetails value="0"/>
+						<ashowTypeOption value="0"/>
+						<ashowOwnerOption value="3"/>
+						<ashowAttributesType value="0"/>
+						<ashowOperationsParameters value="0"/>
+						<ashowOperationsReturnType value="0"/>
+					</properties>
+				</xmi:Extension>
+				<elementFill color1="Cr:122,207,245,255" color2="" style="1" transparency="0" type="1"/>
+				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
+				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
+			</uml:DiagramElement>
+			<uml:DiagramElement geometry="420,131;420,102;480,102;480,157;440,157;" preferredShapeType="Association" subject="LrnLWuyEwTiAAggO" xmi:id="LrnLWuyEwTiAAggT">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<captionBounds value="476,114,108,14"/>
 					<captionInternalWidth value="-2147483648"/>
 					<captionInternalHeight value="-2147483648"/>
 					<captionVisible value="true"/>
@@ -8692,7 +10492,7 @@
 					<properties>
 						<abackground value="Cr:192,192,192,255"/>
 						<aforeground value="Cr:0,0,0,255"/>
-						<azOrder value="13"/>
+						<azOrder value="16"/>
 						<acreatorDiagramType value="ClassDiagram"/>
 						<aselectable value="true"/>
 						<arequestResetCaption value="false"/>
@@ -8747,9 +10547,9 @@
 				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
 				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
 			</uml:DiagramElement>
-			<uml:DiagramElement geometry="460,165;460,239;" preferredShapeType="AssociationClass" subject="fBMrWuyEwTiAAggi" xmi:id="fBMrWuyEwTiAAggj">
-				<xmi:Extension extender="Visual Paradigm for UML">
-					<captionBounds value="454,214,20,0"/>
+			<uml:DiagramElement geometry="467,157;467,239;" preferredShapeType="AssociationClass" subject="fBMrWuyEwTiAAggi" xmi:id="fBMrWuyEwTiAAggj">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<captionBounds value="461,211,20,0"/>
 					<captionInternalWidth value="-2147483648"/>
 					<captionInternalHeight value="-2147483648"/>
 					<captionVisible value="true"/>
@@ -8792,7 +10592,7 @@
 					<properties>
 						<abackground value="Cr:192,192,192,255"/>
 						<aforeground value="Cr:0,0,0,255"/>
-						<azOrder value="11"/>
+						<azOrder value="14"/>
 						<aselectable value="true"/>
 						<arequestResetCaption value="false"/>
 						<arequestResetCaptionSize value="false"/>
@@ -8856,7 +10656,7 @@
 					<properties>
 						<abackground value="Cr:192,192,192,255"/>
 						<aforeground value="Cr:0,0,0,255"/>
-						<azOrder value="9"/>
+						<azOrder value="12"/>
 						<aselectable value="true"/>
 						<arequestResetCaption value="false"/>
 						<arequestResetCaptionSize value="false"/>
@@ -8910,73 +10710,9 @@
 				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
 				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
 			</uml:DiagramElement>
-			<uml:DiagramElement geometry="570,241;700,179;" preferredShapeType="Association" subject="pJ.rWuyEwTiAAghI" xmi:id="pJ.rWuyEwTiAAghN">
-				<xmi:Extension extender="Visual Paradigm for UML">
-					<captionBounds value="630,169,58,14"/>
-					<captionInternalWidth value="-2147483648"/>
-					<captionInternalHeight value="-2147483648"/>
-					<captionVisible value="true"/>
-					<captionSide value="1"/>
-					<properties>
-						<abackground value="Cr:122,207,245,255"/>
-						<aforeground value="Cr:0,0,0,255"/>
-						<azOrder value="-1"/>
-						<acreatorDiagramType value="ClassDiagram"/>
-						<aselectable value="true"/>
-						<arequestResetCaption value="false"/>
-						<arequestResetCaptionSize value="false"/>
-						<aconnectorStyle value="3"/>
-						<aconnectorLineJumps value="4"/>
-						<aconnectorLabelOrientation value="4"/>
-						<afromShapeXDiff value="0"/>
-						<afromShapeYDiff value="0"/>
-						<atoShapeXDiff value="0"/>
-						<atoShapeYDiff value="0"/>
-						<afromConnectType value="0"/>
-						<atoConnectType value="0"/>
-						<auseFromShapeCenter value="true"/>
-						<auseToShapeCenter value="true"/>
-						<afromPinType value="1"/>
-						<atoPinType value="1"/>
-						<arequestRebuild value="false"/>
-						<ashowConnectorName value="2"/>
-						<apaintThroughLabel value="2"/>
-						<ahasRoleAShape value="false"/>
-						<ahasRoleBShape value="false"/>
-						<ashowMultiplicityConstraints value="false"/>
-						<ahasMultiplicityAShape value="false"/>
-						<ahasMultiplicityBShape value="false"/>
-						<a0SwDr value="false"/>
-						<ashowStereotypes value="true"/>
-						<ashowFromRoleName value="true"/>
-						<ashowToRoleName value="true"/>
-						<ashowFromMultiplicity value="true"/>
-						<ashowToMultiplicity value="true"/>
-						<ashowFromRoleVisibility value="true"/>
-						<ashowToRoleVisibility value="true"/>
-						<ashowAssociationEndPropertyStrings value="false"/>
-						<ahasAssociationEndPropertyStringsAShape value="false"/>
-						<ahasAssociationEndPropertyStringsBShape value="false"/>
-						<afromRoleInternalWidth value="-2147483648"/>
-						<afromRoleInternalHeight value="-2147483648"/>
-						<atoRoleInternalWidth value="-2147483648"/>
-						<atoRoleInternalHeight value="-2147483648"/>
-						<afromMultiplicityInternalWidth value="-2147483648"/>
-						<afromMultiplicityInternalHeight value="-2147483648"/>
-						<atoMultiplicityInternalWidth value="-2147483648"/>
-						<atoMultiplicityInternalHeight value="-2147483648"/>
-						<aassociationEndPropertyStringsAInternalWidth value="-2147483648"/>
-						<aassociationEndPropertyStringsAInternalHeight value="-2147483648"/>
-						<aassociationEndPropertyStringsBInternalWidth value="-2147483648"/>
-						<aassociationEndPropertyStringsBInternalHeight value="-2147483648"/>
-					</properties>
-				</xmi:Extension>
-				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
-				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
-			</uml:DiagramElement>
-			<uml:DiagramElement geometry="570,240;699,240;" preferredShapeType="Association" subject="V9JrWuyEwTiAAghT" xmi:id="19JrWuyEwTiAAghY">
-				<xmi:Extension extender="Visual Paradigm for UML">
-					<captionBounds value="600,250,78,14"/>
+			<uml:DiagramElement geometry="570,241;700,169;" preferredShapeType="Association" subject="pJ.rWuyEwTiAAghI" xmi:id="pJ.rWuyEwTiAAghN">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<captionBounds value="626,205,58,14"/>
 					<captionInternalWidth value="-2147483648"/>
 					<captionInternalHeight value="-2147483648"/>
 					<captionVisible value="true"/>
@@ -9038,176 +10774,9 @@
 				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
 				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
 			</uml:DiagramElement>
-			<uml:DiagramElement geometry="570,289;700,341;" preferredShapeType="Association" subject="82XrWuyEwTiAAgh1" xmi:id="C2XrWuyEwTiAAgh6">
-				<xmi:Extension extender="Visual Paradigm for UML">
-					<captionBounds value="627,304,20,0"/>
-					<captionInternalWidth value="-2147483648"/>
-					<captionInternalHeight value="-2147483648"/>
-					<captionVisible value="true"/>
-					<captionSide value="1"/>
-					<roleA roleName="570,310,52,14"/>
-					<properties>
-						<abackground value="Cr:122,207,245,255"/>
-						<aforeground value="Cr:0,0,0,255"/>
-						<azOrder value="-1"/>
-						<acreatorDiagramType value="ClassDiagram"/>
-						<aselectable value="true"/>
-						<arequestResetCaption value="false"/>
-						<arequestResetCaptionSize value="false"/>
-						<aconnectorStyle value="3"/>
-						<aconnectorLineJumps value="4"/>
-						<aconnectorLabelOrientation value="4"/>
-						<afromShapeXDiff value="0"/>
-						<afromShapeYDiff value="0"/>
-						<atoShapeXDiff value="0"/>
-						<atoShapeYDiff value="0"/>
-						<afromConnectType value="0"/>
-						<atoConnectType value="0"/>
-						<auseFromShapeCenter value="true"/>
-						<auseToShapeCenter value="true"/>
-						<afromPinType value="1"/>
-						<atoPinType value="1"/>
-						<arequestRebuild value="false"/>
-						<ashowConnectorName value="2"/>
-						<apaintThroughLabel value="2"/>
-						<ahasRoleAShape value="true"/>
-						<ahasRoleBShape value="false"/>
-						<ashowMultiplicityConstraints value="false"/>
-						<aroleARectangle value="Re:570.0,310.0,52.0,14.0"/>
-						<ahasMultiplicityAShape value="false"/>
-						<ahasMultiplicityBShape value="false"/>
-						<a0SwDr value="false"/>
-						<ashowStereotypes value="true"/>
-						<ashowFromRoleName value="true"/>
-						<ashowToRoleName value="true"/>
-						<ashowFromMultiplicity value="true"/>
-						<ashowToMultiplicity value="true"/>
-						<ashowFromRoleVisibility value="true"/>
-						<ashowToRoleVisibility value="true"/>
-						<ashowAssociationEndPropertyStrings value="false"/>
-						<ahasAssociationEndPropertyStringsAShape value="false"/>
-						<ahasAssociationEndPropertyStringsBShape value="false"/>
-						<afromRoleInternalWidth value="-2147483648"/>
-						<afromRoleInternalHeight value="-2147483648"/>
-						<atoRoleInternalWidth value="-2147483648"/>
-						<atoRoleInternalHeight value="-2147483648"/>
-						<afromMultiplicityInternalWidth value="-2147483648"/>
-						<afromMultiplicityInternalHeight value="-2147483648"/>
-						<atoMultiplicityInternalWidth value="-2147483648"/>
-						<atoMultiplicityInternalHeight value="-2147483648"/>
-						<aassociationEndPropertyStringsAInternalWidth value="-2147483648"/>
-						<aassociationEndPropertyStringsAInternalHeight value="-2147483648"/>
-						<aassociationEndPropertyStringsBInternalWidth value="-2147483648"/>
-						<aassociationEndPropertyStringsBInternalHeight value="-2147483648"/>
-					</properties>
-				</xmi:Extension>
-				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
-				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
-			</uml:DiagramElement>
-			<uml:DiagramElement geometry="350,380,120,40" preferredShapeType="Class" subject="iwsbWuyEwTiAAgiT" xmi:id="iwsbWuyEwTiAAgiS">
-				<xmi:Extension extender="Visual Paradigm for UML">
-					<captionBounds value="0,0,120,14"/>
-					<captionInternalWidth value="-2147483648"/>
-					<captionInternalHeight value="-2147483648"/>
-					<captionVisible value="true"/>
-					<captionSide value="12"/>
-					<properties>
-						<abackground value="Cr:192,192,192,255"/>
-						<aforeground value="Cr:0,0,0,255"/>
-						<azOrder value="7"/>
-						<acreatorDiagramType value="ClassDiagram"/>
-						<aselectable value="true"/>
-						<arequestResetCaption value="false"/>
-						<arequestResetCaptionSize value="false"/>
-						<adisplayStereotypeIcon value="false"/>
-						<aoverrideAppearanceWithStereotypeIcon value="true"/>
-						<arequestSetSizeOption value="0"/>
-						<aparentConnectorHeaderLength value="40"/>
-						<aparentConnectorLineLength value="10"/>
-						<aconnectToPoint value="true"/>
-						<aparentConnectorDTheta value="0.0"/>
-						<aconnectionPointType value="2"/>
-						<amodelElementNameAlignment value="9"/>
-						<arequestDefaultSize value="false"/>
-						<arequestFitSize value="false"/>
-						<arequestFitSizeFromCenter value="false"/>
-						<adisplayAsRobustnessAnalysisIcon value="true"/>
-						<avisibilityStyle value="1"/>
-						<ashowAttributeType value="1"/>
-						<ashowOperationType value="1"/>
-						<amSwTpPts value="true"/>
-						<alshRfAts value="true"/>
-						<amShDrAt value="false"/>
-						<akShDrOp value="false"/>
-						<akSwCsMbSt value="true"/>
-						<ashowClassMemberConstraints value="true"/>
-						<alShCmMl value="false"/>
-						<ashowOperationParameterDirection value="false"/>
-						<ashowOperationRaisedExceptions value="false"/>
-						<ashowParameterNameInOperationSignature value="true"/>
-						<ashowOperationTemplateParameters value="false"/>
-						<ashowOperationProperties value="false"/>
-						<awpMbs value="false"/>
-						<aattributeSortType value="0"/>
-						<aoperationSortType value="0"/>
-						<ashowInitialAttributeValue value="true"/>
-						<ashowOperationSignature value="true"/>
-						<ainterfaceBall value="false"/>
-						<ashowEmptyCompartments value="0"/>
-						<ashowEllipsisForUnshownMembers value="0"/>
-						<ashowAttributesCodeDetails value="0"/>
-						<ashowOperationsCodeDetails value="0"/>
-						<ashowParametersCodeDetails value="0"/>
-						<ashowTypeOption value="0"/>
-						<ashowOwnerOption value="3"/>
-						<ashowAttributesType value="0"/>
-						<ashowOperationsParameters value="0"/>
-						<ashowOperationsReturnType value="0"/>
-					</properties>
-				</xmi:Extension>
-				<elementFill color1="Cr:192,192,192,255" color2="" style="1" transparency="0" type="1"/>
-				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
-				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
-			</uml:DiagramElement>
-			<uml:DiagramElement geometry="460,290;460,379;" preferredShapeType="Generalization" subject="c8WbWuyEwTiAAgig" xmi:id="c8WbWuyEwTiAAgih">
-				<xmi:Extension extender="Visual Paradigm for UML">
-					<captionBounds value="458,329,20,0"/>
-					<captionInternalWidth value="-2147483648"/>
-					<captionInternalHeight value="-2147483648"/>
-					<captionVisible value="true"/>
-					<captionSide value="1"/>
-					<properties>
-						<abackground value="Cr:255,255,255,255"/>
-						<aforeground value="Cr:0,0,0,255"/>
-						<azOrder value="-1"/>
-						<acreatorDiagramType value="ClassDiagram"/>
-						<aselectable value="true"/>
-						<arequestResetCaption value="false"/>
-						<arequestResetCaptionSize value="false"/>
-						<aconnectorStyle value="3"/>
-						<aconnectorLineJumps value="4"/>
-						<aconnectorLabelOrientation value="4"/>
-						<afromShapeXDiff value="0"/>
-						<afromShapeYDiff value="0"/>
-						<atoShapeXDiff value="0"/>
-						<atoShapeYDiff value="0"/>
-						<afromConnectType value="0"/>
-						<atoConnectType value="0"/>
-						<auseFromShapeCenter value="true"/>
-						<auseToShapeCenter value="true"/>
-						<afromPinType value="1"/>
-						<atoPinType value="1"/>
-						<arequestRebuild value="false"/>
-						<ashowConnectorName value="2"/>
-						<apaintThroughLabel value="2"/>
-					</properties>
-				</xmi:Extension>
-				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
-				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
-			</uml:DiagramElement>
-			<uml:DiagramElement geometry="400,139;400,80;330,80;330,160;359,160;" preferredShapeType="Association" subject="77xbWuyEwTiAAgi0" xmi:id="H7xbWuyEwTiAAgi5">
-				<xmi:Extension extender="Visual Paradigm for UML">
-					<captionBounds value="310,60,97,14"/>
+			<uml:DiagramElement geometry="570,259;699,259;" preferredShapeType="Association" subject="V9JrWuyEwTiAAghT" xmi:id="19JrWuyEwTiAAghY">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<captionBounds value="596,264,78,14"/>
 					<captionInternalWidth value="-2147483648"/>
 					<captionInternalHeight value="-2147483648"/>
 					<captionVisible value="true"/>
@@ -9269,44 +10838,176 @@
 				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
 				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
 			</uml:DiagramElement>
-			<uml:DiagramElement geometry="350,160;370,380;" preferredShapeType="AssociationClass" subject="bCjbWuyEwTiAAgjB" xmi:id="bCjbWuyEwTiAAgjC">
-				<xmi:Extension extender="Visual Paradigm for UML">
-					<captionBounds value="371,290,20,0"/>
-					<captionInternalWidth value="-2147483648"/>
-					<captionInternalHeight value="-2147483648"/>
-					<captionVisible value="true"/>
-					<captionSide value="1"/>
-					<properties>
-						<abackground value="Cr:122,207,245,255"/>
-						<aforeground value="Cr:0,0,0,255"/>
-						<azOrder value="-1"/>
-						<aselectable value="true"/>
-						<arequestResetCaption value="false"/>
-						<arequestResetCaptionSize value="false"/>
-						<aconnectorStyle value="3"/>
-						<aconnectorLineJumps value="4"/>
-						<aconnectorLabelOrientation value="4"/>
-						<afromShapeXDiff value="0"/>
-						<afromShapeYDiff value="0"/>
-						<atoShapeXDiff value="0"/>
-						<atoShapeYDiff value="0"/>
-						<afromConnectType value="0"/>
-						<atoConnectType value="0"/>
-						<auseFromShapeCenter value="true"/>
-						<auseToShapeCenter value="true"/>
-						<afromPinType value="1"/>
-						<atoPinType value="1"/>
-						<arequestRebuild value="false"/>
-						<ashowConnectorName value="2"/>
-						<apaintThroughLabel value="2"/>
-					</properties>
-				</xmi:Extension>
-				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
-				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
-			</uml:DiagramElement>
-			<uml:DiagramElement geometry="390,139;390,90;310,90;310,170;359,170;" preferredShapeType="Association" subject="gi8U.uyCiu1SNwYm" xmi:id="gi8U.uyCiu1SNwYr">
-				<xmi:Extension extender="Visual Paradigm for UML">
-					<captionBounds value="220,70,107,14"/>
+			<uml:DiagramElement geometry="570,289;700,360;" preferredShapeType="Association" subject="82XrWuyEwTiAAgh1" xmi:id="C2XrWuyEwTiAAgh6">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<captionBounds value="627,313,20,0"/>
+					<captionInternalWidth value="-2147483648"/>
+					<captionInternalHeight value="-2147483648"/>
+					<captionVisible value="true"/>
+					<captionSide value="1"/>
+					<roleA roleName="600,332,52,14"/>
+					<properties>
+						<abackground value="Cr:122,207,245,255"/>
+						<aforeground value="Cr:0,0,0,255"/>
+						<azOrder value="-1"/>
+						<acreatorDiagramType value="ClassDiagram"/>
+						<aselectable value="true"/>
+						<arequestResetCaption value="false"/>
+						<arequestResetCaptionSize value="false"/>
+						<aconnectorStyle value="3"/>
+						<aconnectorLineJumps value="4"/>
+						<aconnectorLabelOrientation value="4"/>
+						<afromShapeXDiff value="0"/>
+						<afromShapeYDiff value="0"/>
+						<atoShapeXDiff value="0"/>
+						<atoShapeYDiff value="0"/>
+						<afromConnectType value="0"/>
+						<atoConnectType value="0"/>
+						<auseFromShapeCenter value="true"/>
+						<auseToShapeCenter value="true"/>
+						<afromPinType value="1"/>
+						<atoPinType value="1"/>
+						<arequestRebuild value="false"/>
+						<ashowConnectorName value="2"/>
+						<apaintThroughLabel value="2"/>
+						<ahasRoleAShape value="true"/>
+						<ahasRoleBShape value="false"/>
+						<ashowMultiplicityConstraints value="false"/>
+						<aroleARectangle value="Re:600.0,332.0,52.0,14.0"/>
+						<ahasMultiplicityAShape value="false"/>
+						<ahasMultiplicityBShape value="false"/>
+						<a0SwDr value="false"/>
+						<ashowStereotypes value="true"/>
+						<ashowFromRoleName value="true"/>
+						<ashowToRoleName value="true"/>
+						<ashowFromMultiplicity value="true"/>
+						<ashowToMultiplicity value="true"/>
+						<ashowFromRoleVisibility value="true"/>
+						<ashowToRoleVisibility value="true"/>
+						<ashowAssociationEndPropertyStrings value="false"/>
+						<ahasAssociationEndPropertyStringsAShape value="false"/>
+						<ahasAssociationEndPropertyStringsBShape value="false"/>
+						<afromRoleInternalWidth value="-2147483648"/>
+						<afromRoleInternalHeight value="-2147483648"/>
+						<atoRoleInternalWidth value="-2147483648"/>
+						<atoRoleInternalHeight value="-2147483648"/>
+						<afromMultiplicityInternalWidth value="-2147483648"/>
+						<afromMultiplicityInternalHeight value="-2147483648"/>
+						<atoMultiplicityInternalWidth value="-2147483648"/>
+						<atoMultiplicityInternalHeight value="-2147483648"/>
+						<aassociationEndPropertyStringsAInternalWidth value="-2147483648"/>
+						<aassociationEndPropertyStringsAInternalHeight value="-2147483648"/>
+						<aassociationEndPropertyStringsBInternalWidth value="-2147483648"/>
+						<aassociationEndPropertyStringsBInternalHeight value="-2147483648"/>
+					</properties>
+				</xmi:Extension>
+				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
+				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
+			</uml:DiagramElement>
+			<uml:DiagramElement geometry="344,380,105,40" preferredShapeType="Class" subject="iwsbWuyEwTiAAgiT" xmi:id="iwsbWuyEwTiAAgiS">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<captionBounds value="0,0,105,28"/>
+					<captionInternalWidth value="-2147483648"/>
+					<captionInternalHeight value="-2147483648"/>
+					<captionVisible value="true"/>
+					<captionSide value="12"/>
+					<properties>
+						<abackground value="Cr:192,192,192,255"/>
+						<aforeground value="Cr:0,0,0,255"/>
+						<azOrder value="10"/>
+						<acreatorDiagramType value="ClassDiagram"/>
+						<aselectable value="true"/>
+						<arequestResetCaption value="false"/>
+						<arequestResetCaptionSize value="false"/>
+						<adisplayStereotypeIcon value="false"/>
+						<aoverrideAppearanceWithStereotypeIcon value="true"/>
+						<arequestSetSizeOption value="0"/>
+						<aparentConnectorHeaderLength value="40"/>
+						<aparentConnectorLineLength value="10"/>
+						<aconnectToPoint value="true"/>
+						<aparentConnectorDTheta value="0.0"/>
+						<aconnectionPointType value="2"/>
+						<amodelElementNameAlignment value="9"/>
+						<arequestDefaultSize value="false"/>
+						<arequestFitSize value="false"/>
+						<arequestFitSizeFromCenter value="false"/>
+						<adisplayAsRobustnessAnalysisIcon value="true"/>
+						<avisibilityStyle value="1"/>
+						<ashowAttributeType value="1"/>
+						<ashowOperationType value="1"/>
+						<amSwTpPts value="true"/>
+						<alshRfAts value="true"/>
+						<amShDrAt value="false"/>
+						<akShDrOp value="false"/>
+						<akSwCsMbSt value="true"/>
+						<ashowClassMemberConstraints value="true"/>
+						<alShCmMl value="false"/>
+						<ashowOperationParameterDirection value="false"/>
+						<ashowOperationRaisedExceptions value="false"/>
+						<ashowParameterNameInOperationSignature value="true"/>
+						<ashowOperationTemplateParameters value="false"/>
+						<ashowOperationProperties value="false"/>
+						<awpMbs value="false"/>
+						<aattributeSortType value="0"/>
+						<aoperationSortType value="0"/>
+						<ashowInitialAttributeValue value="true"/>
+						<ashowOperationSignature value="true"/>
+						<ainterfaceBall value="false"/>
+						<ashowEmptyCompartments value="0"/>
+						<ashowEllipsisForUnshownMembers value="0"/>
+						<ashowAttributesCodeDetails value="0"/>
+						<ashowOperationsCodeDetails value="0"/>
+						<ashowParametersCodeDetails value="0"/>
+						<ashowTypeOption value="0"/>
+						<ashowOwnerOption value="3"/>
+						<ashowAttributesType value="0"/>
+						<ashowOperationsParameters value="0"/>
+						<ashowOperationsReturnType value="0"/>
+					</properties>
+				</xmi:Extension>
+				<elementFill color1="Cr:192,192,192,255" color2="" style="1" transparency="0" type="1"/>
+				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
+				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
+			</uml:DiagramElement>
+			<uml:DiagramElement geometry="460,290;448,380;" preferredShapeType="Generalization" subject="c8WbWuyEwTiAAgig" xmi:id="c8WbWuyEwTiAAgih">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<captionBounds value="453,330,20,0"/>
+					<captionInternalWidth value="-2147483648"/>
+					<captionInternalHeight value="-2147483648"/>
+					<captionVisible value="true"/>
+					<captionSide value="1"/>
+					<properties>
+						<abackground value="Cr:255,255,255,255"/>
+						<aforeground value="Cr:0,0,0,255"/>
+						<azOrder value="-1"/>
+						<acreatorDiagramType value="ClassDiagram"/>
+						<aselectable value="true"/>
+						<arequestResetCaption value="false"/>
+						<arequestResetCaptionSize value="false"/>
+						<aconnectorStyle value="3"/>
+						<aconnectorLineJumps value="4"/>
+						<aconnectorLabelOrientation value="4"/>
+						<afromShapeXDiff value="0"/>
+						<afromShapeYDiff value="0"/>
+						<atoShapeXDiff value="0"/>
+						<atoShapeYDiff value="0"/>
+						<afromConnectType value="0"/>
+						<atoConnectType value="0"/>
+						<auseFromShapeCenter value="true"/>
+						<auseToShapeCenter value="true"/>
+						<afromPinType value="1"/>
+						<atoPinType value="1"/>
+						<arequestRebuild value="false"/>
+						<ashowConnectorName value="2"/>
+						<apaintThroughLabel value="2"/>
+					</properties>
+				</xmi:Extension>
+				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
+				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
+			</uml:DiagramElement>
+			<uml:DiagramElement geometry="410,131;410,36;314,36;314,152;359,152;" preferredShapeType="Association" subject="77xbWuyEwTiAAgi0" xmi:id="H7xbWuyEwTiAAgi5">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<captionBounds value="288,18,97,14"/>
 					<captionInternalWidth value="-2147483648"/>
 					<captionInternalHeight value="-2147483648"/>
 					<captionVisible value="true"/>
@@ -9368,9 +11069,44 @@
 				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
 				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
 			</uml:DiagramElement>
-			<uml:DiagramElement geometry="380,139;380,100;290,100;290,180;359,180;" preferredShapeType="Association" subject="D2RU.uyCiu1SNwZA" xmi:id="j2RU.uyCiu1SNwZF">
-				<xmi:Extension extender="Visual Paradigm for UML">
-					<captionBounds value="170,110,118,14"/>
+			<uml:DiagramElement geometry="350,152;350,379;" preferredShapeType="AssociationClass" subject="bCjbWuyEwTiAAgjB" xmi:id="bCjbWuyEwTiAAgjC">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<captionBounds value="361,287,20,0"/>
+					<captionInternalWidth value="-2147483648"/>
+					<captionInternalHeight value="-2147483648"/>
+					<captionVisible value="true"/>
+					<captionSide value="1"/>
+					<properties>
+						<abackground value="Cr:122,207,245,255"/>
+						<aforeground value="Cr:0,0,0,255"/>
+						<azOrder value="-1"/>
+						<aselectable value="true"/>
+						<arequestResetCaption value="false"/>
+						<arequestResetCaptionSize value="false"/>
+						<aconnectorStyle value="3"/>
+						<aconnectorLineJumps value="4"/>
+						<aconnectorLabelOrientation value="4"/>
+						<afromShapeXDiff value="0"/>
+						<afromShapeYDiff value="0"/>
+						<atoShapeXDiff value="0"/>
+						<atoShapeYDiff value="0"/>
+						<afromConnectType value="0"/>
+						<atoConnectType value="0"/>
+						<auseFromShapeCenter value="true"/>
+						<auseToShapeCenter value="true"/>
+						<afromPinType value="1"/>
+						<atoPinType value="1"/>
+						<arequestRebuild value="false"/>
+						<ashowConnectorName value="2"/>
+						<apaintThroughLabel value="2"/>
+					</properties>
+				</xmi:Extension>
+				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
+				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
+			</uml:DiagramElement>
+			<uml:DiagramElement geometry="390,131;390,53;286,53;286,162;359,162;" preferredShapeType="Association" subject="gi8U.uyCiu1SNwYm" xmi:id="gi8U.uyCiu1SNwYr">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<captionBounds value="206,37,107,14"/>
 					<captionInternalWidth value="-2147483648"/>
 					<captionInternalHeight value="-2147483648"/>
 					<captionVisible value="true"/>
@@ -9432,9 +11168,73 @@
 				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
 				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
 			</uml:DiagramElement>
-			<uml:DiagramElement geometry="220,380,120,40" preferredShapeType="Class" subject="ZKXU.uyCiu1SNwZb" xmi:id="ZKXU.uyCiu1SNwZa">
-				<xmi:Extension extender="Visual Paradigm for UML">
-					<captionBounds value="0,0,120,14"/>
+			<uml:DiagramElement geometry="380,131;380,71;264,71;264,172;359,172;" preferredShapeType="Association" subject="D2RU.uyCiu1SNwZA" xmi:id="j2RU.uyCiu1SNwZF">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<captionBounds value="164,54,118,14"/>
+					<captionInternalWidth value="-2147483648"/>
+					<captionInternalHeight value="-2147483648"/>
+					<captionVisible value="true"/>
+					<captionSide value="1"/>
+					<properties>
+						<abackground value="Cr:122,207,245,255"/>
+						<aforeground value="Cr:0,0,0,255"/>
+						<azOrder value="-1"/>
+						<acreatorDiagramType value="ClassDiagram"/>
+						<aselectable value="true"/>
+						<arequestResetCaption value="false"/>
+						<arequestResetCaptionSize value="false"/>
+						<aconnectorStyle value="3"/>
+						<aconnectorLineJumps value="4"/>
+						<aconnectorLabelOrientation value="4"/>
+						<afromShapeXDiff value="0"/>
+						<afromShapeYDiff value="0"/>
+						<atoShapeXDiff value="0"/>
+						<atoShapeYDiff value="0"/>
+						<afromConnectType value="0"/>
+						<atoConnectType value="0"/>
+						<auseFromShapeCenter value="true"/>
+						<auseToShapeCenter value="true"/>
+						<afromPinType value="1"/>
+						<atoPinType value="1"/>
+						<arequestRebuild value="false"/>
+						<ashowConnectorName value="2"/>
+						<apaintThroughLabel value="2"/>
+						<ahasRoleAShape value="false"/>
+						<ahasRoleBShape value="false"/>
+						<ashowMultiplicityConstraints value="false"/>
+						<ahasMultiplicityAShape value="false"/>
+						<ahasMultiplicityBShape value="false"/>
+						<a0SwDr value="false"/>
+						<ashowStereotypes value="true"/>
+						<ashowFromRoleName value="true"/>
+						<ashowToRoleName value="true"/>
+						<ashowFromMultiplicity value="true"/>
+						<ashowToMultiplicity value="true"/>
+						<ashowFromRoleVisibility value="true"/>
+						<ashowToRoleVisibility value="true"/>
+						<ashowAssociationEndPropertyStrings value="false"/>
+						<ahasAssociationEndPropertyStringsAShape value="false"/>
+						<ahasAssociationEndPropertyStringsBShape value="false"/>
+						<afromRoleInternalWidth value="-2147483648"/>
+						<afromRoleInternalHeight value="-2147483648"/>
+						<atoRoleInternalWidth value="-2147483648"/>
+						<atoRoleInternalHeight value="-2147483648"/>
+						<afromMultiplicityInternalWidth value="-2147483648"/>
+						<afromMultiplicityInternalHeight value="-2147483648"/>
+						<atoMultiplicityInternalWidth value="-2147483648"/>
+						<atoMultiplicityInternalHeight value="-2147483648"/>
+						<aassociationEndPropertyStringsAInternalWidth value="-2147483648"/>
+						<aassociationEndPropertyStringsAInternalHeight value="-2147483648"/>
+						<aassociationEndPropertyStringsBInternalWidth value="-2147483648"/>
+						<aassociationEndPropertyStringsBInternalHeight value="-2147483648"/>
+					</properties>
+				</xmi:Extension>
+				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
+				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
+			</uml:DiagramElement>
+			<uml:DiagramElement geometry="213,380,113,40" preferredShapeType="Class" subject="ZKXU.uyCiu1SNwZb" xmi:id="ZKXU.uyCiu1SNwZa">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<captionBounds value="0,0,113,28"/>
 					<captionInternalWidth value="-2147483648"/>
 					<captionInternalHeight value="-2147483648"/>
 					<captionVisible value="true"/>
@@ -9442,7 +11242,7 @@
 					<properties>
 						<abackground value="Cr:192,192,192,255"/>
 						<aforeground value="Cr:0,0,0,255"/>
-						<azOrder value="3"/>
+						<azOrder value="6"/>
 						<acreatorDiagramType value="ClassDiagram"/>
 						<aselectable value="true"/>
 						<arequestResetCaption value="false"/>
@@ -9497,9 +11297,430 @@
 				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
 				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
 			</uml:DiagramElement>
-			<uml:DiagramElement geometry="70,380,130,40" preferredShapeType="Class" subject="W8Q0.uyCiu1SNwZl" xmi:id="W8Q0.uyCiu1SNwZk">
-				<xmi:Extension extender="Visual Paradigm for UML">
-					<captionBounds value="0,0,130,14"/>
+			<uml:DiagramElement geometry="70,380,125,40" preferredShapeType="Class" subject="W8Q0.uyCiu1SNwZl" xmi:id="W8Q0.uyCiu1SNwZk">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<captionBounds value="0,0,125,28"/>
+					<captionInternalWidth value="-2147483648"/>
+					<captionInternalHeight value="-2147483648"/>
+					<captionVisible value="true"/>
+					<captionSide value="12"/>
+					<properties>
+						<abackground value="Cr:192,192,192,255"/>
+						<aforeground value="Cr:0,0,0,255"/>
+						<azOrder value="4"/>
+						<acreatorDiagramType value="ClassDiagram"/>
+						<aselectable value="true"/>
+						<arequestResetCaption value="false"/>
+						<arequestResetCaptionSize value="false"/>
+						<adisplayStereotypeIcon value="false"/>
+						<aoverrideAppearanceWithStereotypeIcon value="true"/>
+						<arequestSetSizeOption value="0"/>
+						<aparentConnectorHeaderLength value="40"/>
+						<aparentConnectorLineLength value="10"/>
+						<aconnectToPoint value="true"/>
+						<aparentConnectorDTheta value="0.0"/>
+						<aconnectionPointType value="2"/>
+						<amodelElementNameAlignment value="9"/>
+						<arequestDefaultSize value="false"/>
+						<arequestFitSize value="false"/>
+						<arequestFitSizeFromCenter value="false"/>
+						<adisplayAsRobustnessAnalysisIcon value="true"/>
+						<avisibilityStyle value="1"/>
+						<ashowAttributeType value="1"/>
+						<ashowOperationType value="1"/>
+						<amSwTpPts value="true"/>
+						<alshRfAts value="true"/>
+						<amShDrAt value="false"/>
+						<akShDrOp value="false"/>
+						<akSwCsMbSt value="true"/>
+						<ashowClassMemberConstraints value="true"/>
+						<alShCmMl value="false"/>
+						<ashowOperationParameterDirection value="false"/>
+						<ashowOperationRaisedExceptions value="false"/>
+						<ashowParameterNameInOperationSignature value="true"/>
+						<ashowOperationTemplateParameters value="false"/>
+						<ashowOperationProperties value="false"/>
+						<awpMbs value="false"/>
+						<aattributeSortType value="0"/>
+						<aoperationSortType value="0"/>
+						<ashowInitialAttributeValue value="true"/>
+						<ashowOperationSignature value="true"/>
+						<ainterfaceBall value="false"/>
+						<ashowEmptyCompartments value="0"/>
+						<ashowEllipsisForUnshownMembers value="0"/>
+						<ashowAttributesCodeDetails value="0"/>
+						<ashowOperationsCodeDetails value="0"/>
+						<ashowParametersCodeDetails value="0"/>
+						<ashowTypeOption value="0"/>
+						<ashowOwnerOption value="3"/>
+						<ashowAttributesType value="0"/>
+						<ashowOperationsParameters value="0"/>
+						<ashowOperationsReturnType value="0"/>
+					</properties>
+				</xmi:Extension>
+				<elementFill color1="Cr:192,192,192,255" color2="" style="1" transparency="0" type="1"/>
+				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
+				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
+			</uml:DiagramElement>
+			<uml:DiagramElement geometry="450,290;326,380;" preferredShapeType="Generalization" subject="6eo0.uyCiu1SNwZp" xmi:id="6eo0.uyCiu1SNwZq">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<captionBounds value="378,330,20,0"/>
+					<captionInternalWidth value="-2147483648"/>
+					<captionInternalHeight value="-2147483648"/>
+					<captionVisible value="true"/>
+					<captionSide value="1"/>
+					<properties>
+						<abackground value="Cr:255,255,255,255"/>
+						<aforeground value="Cr:0,0,0,255"/>
+						<azOrder value="-1"/>
+						<acreatorDiagramType value="ClassDiagram"/>
+						<aselectable value="true"/>
+						<arequestResetCaption value="false"/>
+						<arequestResetCaptionSize value="false"/>
+						<aconnectorStyle value="3"/>
+						<aconnectorLineJumps value="4"/>
+						<aconnectorLabelOrientation value="4"/>
+						<afromShapeXDiff value="0"/>
+						<afromShapeYDiff value="0"/>
+						<atoShapeXDiff value="0"/>
+						<atoShapeYDiff value="0"/>
+						<afromConnectType value="0"/>
+						<atoConnectType value="0"/>
+						<auseFromShapeCenter value="true"/>
+						<auseToShapeCenter value="true"/>
+						<afromPinType value="1"/>
+						<atoPinType value="1"/>
+						<arequestRebuild value="false"/>
+						<ashowConnectorName value="2"/>
+						<apaintThroughLabel value="2"/>
+					</properties>
+				</xmi:Extension>
+				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
+				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
+			</uml:DiagramElement>
+			<uml:DiagramElement geometry="450,272;195,381;" preferredShapeType="Generalization" subject="cW40.uyCiu1SNwZt" xmi:id="8W40.uyCiu1SNwZu">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<captionBounds value="313,326,20,0"/>
+					<captionInternalWidth value="-2147483648"/>
+					<captionInternalHeight value="-2147483648"/>
+					<captionVisible value="true"/>
+					<captionSide value="1"/>
+					<properties>
+						<abackground value="Cr:255,255,255,255"/>
+						<aforeground value="Cr:0,0,0,255"/>
+						<azOrder value="-1"/>
+						<acreatorDiagramType value="ClassDiagram"/>
+						<aselectable value="true"/>
+						<arequestResetCaption value="false"/>
+						<arequestResetCaptionSize value="false"/>
+						<aconnectorStyle value="3"/>
+						<aconnectorLineJumps value="4"/>
+						<aconnectorLabelOrientation value="4"/>
+						<afromShapeXDiff value="0"/>
+						<afromShapeYDiff value="0"/>
+						<atoShapeXDiff value="0"/>
+						<atoShapeYDiff value="0"/>
+						<afromConnectType value="0"/>
+						<atoConnectType value="0"/>
+						<auseFromShapeCenter value="true"/>
+						<auseToShapeCenter value="true"/>
+						<afromPinType value="1"/>
+						<atoPinType value="1"/>
+						<arequestRebuild value="false"/>
+						<ashowConnectorName value="2"/>
+						<apaintThroughLabel value="2"/>
+					</properties>
+				</xmi:Extension>
+				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
+				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
+			</uml:DiagramElement>
+			<uml:DiagramElement geometry="299,162;299,379;" preferredShapeType="AssociationClass" subject="tqk0.uyCiu1SNwZx" xmi:id="tqk0.uyCiu1SNwZy">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<captionBounds value="314,285,20,0"/>
+					<captionInternalWidth value="-2147483648"/>
+					<captionInternalHeight value="-2147483648"/>
+					<captionVisible value="true"/>
+					<captionSide value="1"/>
+					<properties>
+						<abackground value="Cr:122,207,245,255"/>
+						<aforeground value="Cr:0,0,0,255"/>
+						<azOrder value="-1"/>
+						<aselectable value="true"/>
+						<arequestResetCaption value="false"/>
+						<arequestResetCaptionSize value="false"/>
+						<aconnectorStyle value="3"/>
+						<aconnectorLineJumps value="4"/>
+						<aconnectorLabelOrientation value="4"/>
+						<afromShapeXDiff value="0"/>
+						<afromShapeYDiff value="0"/>
+						<atoShapeXDiff value="0"/>
+						<atoShapeYDiff value="0"/>
+						<afromConnectType value="0"/>
+						<atoConnectType value="0"/>
+						<auseFromShapeCenter value="true"/>
+						<auseToShapeCenter value="true"/>
+						<afromPinType value="1"/>
+						<atoPinType value="1"/>
+						<arequestRebuild value="false"/>
+						<ashowConnectorName value="2"/>
+						<apaintThroughLabel value="2"/>
+					</properties>
+				</xmi:Extension>
+				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
+				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
+			</uml:DiagramElement>
+			<uml:DiagramElement geometry="274,172;194,380;" preferredShapeType="AssociationClass" subject="blc0.uyCiu1SNwZ3" xmi:id="7lc0.uyCiu1SNwZ4">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<captionBounds value="251,282,20,0"/>
+					<captionInternalWidth value="-2147483648"/>
+					<captionInternalHeight value="-2147483648"/>
+					<captionVisible value="true"/>
+					<captionSide value="1"/>
+					<properties>
+						<abackground value="Cr:122,207,245,255"/>
+						<aforeground value="Cr:0,0,0,255"/>
+						<azOrder value="-1"/>
+						<aselectable value="true"/>
+						<arequestResetCaption value="false"/>
+						<arequestResetCaptionSize value="false"/>
+						<aconnectorStyle value="3"/>
+						<aconnectorLineJumps value="4"/>
+						<aconnectorLabelOrientation value="4"/>
+						<afromShapeXDiff value="0"/>
+						<afromShapeYDiff value="0"/>
+						<atoShapeXDiff value="0"/>
+						<atoShapeYDiff value="0"/>
+						<afromConnectType value="0"/>
+						<atoConnectType value="0"/>
+						<auseFromShapeCenter value="true"/>
+						<auseToShapeCenter value="true"/>
+						<afromPinType value="1"/>
+						<atoPinType value="1"/>
+						<arequestRebuild value="false"/>
+						<ashowConnectorName value="2"/>
+						<apaintThroughLabel value="2"/>
+					</properties>
+				</xmi:Extension>
+				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
+				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
+			</uml:DiagramElement>
+			<uml:DiagramElement geometry="560,0,159,71" preferredShapeType="NOTE" subject="afB2HuyCiu1SNxHe" xmi:id="kb6uHuyCiu1SNxJN">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<captionBounds value="0,0,159,0"/>
+					<captionInternalWidth value="-2147483648"/>
+					<captionInternalHeight value="-2147483648"/>
+					<captionVisible value="true"/>
+					<captionSide value="12"/>
+					<properties>
+						<abackground value="Cr:255,255,192,127"/>
+						<aforeground value="Cr:0,0,0,255"/>
+						<azOrder value="2"/>
+						<aselectable value="true"/>
+						<arequestResetCaption value="false"/>
+						<arequestResetCaptionSize value="false"/>
+						<adisplayStereotypeIcon value="false"/>
+						<aoverrideAppearanceWithStereotypeIcon value="true"/>
+						<arequestSetSizeOption value="0"/>
+						<aparentConnectorHeaderLength value="40"/>
+						<aparentConnectorLineLength value="10"/>
+						<aconnectToPoint value="true"/>
+						<aparentConnectorDTheta value="0.0"/>
+						<aconnectionPointType value="2"/>
+						<amodelElementNameAlignment value="9"/>
+						<arequestDefaultSize value="false"/>
+						<arequestFitSize value="false"/>
+						<arequestFitSizeFromCenter value="false"/>
+						<aangle value="0"/>
+					</properties>
+				</xmi:Extension>
+				<elementFill color1="Cr:255,255,192,127" color2="" style="1" transparency="50" type="1"/>
+				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
+				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
+			</uml:DiagramElement>
+			<uml:DiagramElement geometry="310,83,500,127" preferredShapeType="SECurveShape" subject="yr2uHuyCiu1SNxJW" xmi:id="yr2uHuyCiu1SNxJV">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<captionBounds value="0,0,40,40"/>
+					<captionInternalWidth value="-2147483648"/>
+					<captionInternalHeight value="-2147483648"/>
+					<captionVisible value="false"/>
+					<captionSide value="7"/>
+					<properties>
+						<abackground value="Cr:255,255,192,127"/>
+						<aforeground value="Cr:192,192,192,255"/>
+						<azOrder value="22"/>
+						<aselectable value="true"/>
+						<arequestResetCaption value="false"/>
+						<arequestResetCaptionSize value="false"/>
+						<adisplayStereotypeIcon value="false"/>
+						<aoverrideAppearanceWithStereotypeIcon value="true"/>
+						<arequestSetSizeOption value="0"/>
+						<aparentConnectorHeaderLength value="40"/>
+						<aparentConnectorLineLength value="10"/>
+						<aconnectToPoint value="true"/>
+						<aparentConnectorDTheta value="0.0"/>
+						<aconnectionPointType value="2"/>
+						<amodelElementNameAlignment value="9"/>
+						<arequestDefaultSize value="false"/>
+						<arequestFitSize value="false"/>
+						<arequestFitSizeFromCenter value="false"/>
+						<aobjectId value="20"/>
+						<aobjectType value="9096"/>
+						<anotUseVisibleBounds value="false"/>
+						<aalpha value="1.0"/>
+						<arotateAngle value="0.0"/>
+						<anodeName value="VPCurveShape"/>
+						<aactConnector value="true"/>
+						<adrawBy value="3"/>
+					</properties>
+					<FontFormat fontColor="Cr:0,0,0,255">
+						<Font name="Dialog" size="11" style="0"/>
+					</FontFormat>
+					<Label location="Pt:560.0,146.49999999999997" text=""/>
+					<Label transparency="0" tx="0.0" ty="0.0" type="0">
+						<FillFormat renderStyle="1">
+							<AffineTransformMatrix>
+								<Matrix value="1.9999999999999976"/>
+								<Matrix value="0.0"/>
+								<Matrix value="0.0"/>
+								<Matrix value="0.8839285714285712"/>
+								<Matrix value="-323.999999999999"/>
+								<Matrix value="13.026785714285694"/>
+							</AffineTransformMatrix>
+							<Render color="Cr:0,0,0,255"/>
+						</FillFormat>
+					</Label>
+					<ShapeBasePoint point="Pt:560.0,146.5"/>
+					<Arrow endArrow="0" startArrow="0"/>
+					<LineFormat color="Cr:192,192,192,255" style="91" width="1.0">
+						<Stroke cap="0" dashPhase="0.0" join="0" miterlimit="10.0" type="0" width="1.0"/>
+					</LineFormat>
+					<FillFormat renderStyle="1">
+						<AffineTransformMatrix>
+							<Matrix value="1.9999999999999976"/>
+							<Matrix value="0.0"/>
+							<Matrix value="0.0"/>
+							<Matrix value="0.8839285714285712"/>
+							<Matrix value="-323.999999999999"/>
+							<Matrix value="13.026785714285694"/>
+						</AffineTransformMatrix>
+						<Render color="Cr:255,255,192,127"/>
+					</FillFormat>
+					<CurveList windingRule="1">
+						<Curves>
+							<Curve controlPoint1="Pt:442.0,97.0" controlPoint2="Pt:678.0,97.0" endPoint="Pt:796.0,97.0" objectId="1" startPoint="Pt:324.0,97.0"/>
+							<Curve controlPoint1="Pt:796.0,121.75" controlPoint2="Pt:796.0,171.25" endPoint="Pt:796.0,196.0" objectId="2" startPoint="Pt:796.0,97.0"/>
+							<Curve controlPoint1="Pt:678.0,196.0" controlPoint2="Pt:442.0,196.0" endPoint="Pt:324.0,196.0" objectId="3" startPoint="Pt:796.0,196.0"/>
+							<Curve controlPoint1="Pt:324.0,171.25" controlPoint2="Pt:324.0,121.75" endPoint="Pt:324.0,97.0" objectId="4" startPoint="Pt:324.0,196.0"/>
+						</Curves>
+					</CurveList>
+				</xmi:Extension>
+				<elementFill color1="Cr:255,255,192,127" color2="" style="1" transparency="50" type="1"/>
+				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
+				<elementLine color="Cr:192,192,192,255" style="1" transparency="0" weight="1.0"/>
+			</uml:DiagramElement>
+			<uml:DiagramElement geometry="718,71;718,83;" preferredShapeType="Anchor" subject="qlVuHuyCiu1SNxJg" xmi:id="qlVuHuyCiu1SNxJh">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<captionBounds value="708,77,20,0"/>
+					<captionInternalWidth value="-2147483648"/>
+					<captionInternalHeight value="-2147483648"/>
+					<captionVisible value="true"/>
+					<captionSide value="1"/>
+					<properties>
+						<abackground value="Cr:122,207,245,255"/>
+						<aforeground value="Cr:0,0,0,255"/>
+						<azOrder value="-1"/>
+						<acreatorDiagramType value="ClassDiagram"/>
+						<aselectable value="true"/>
+						<arequestResetCaption value="false"/>
+						<arequestResetCaptionSize value="false"/>
+						<aconnectorStyle value="3"/>
+						<aconnectorLineJumps value="4"/>
+						<aconnectorLabelOrientation value="4"/>
+						<afromShapeXDiff value="0"/>
+						<afromShapeYDiff value="0"/>
+						<atoShapeXDiff value="0"/>
+						<atoShapeYDiff value="0"/>
+						<afromConnectType value="0"/>
+						<atoConnectType value="0"/>
+						<auseFromShapeCenter value="true"/>
+						<auseToShapeCenter value="true"/>
+						<afromPinType value="1"/>
+						<atoPinType value="1"/>
+						<arequestRebuild value="false"/>
+						<ashowConnectorName value="2"/>
+						<apaintThroughLabel value="2"/>
+					</properties>
+				</xmi:Extension>
+				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
+				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
+			</uml:DiagramElement>
+			<uml:DiagramElement geometry="368,131;368,89;235,89;235,183;359,183;" preferredShapeType="Association" subject="pKq8nuyCiu1SNxPl" xmi:id="1Kq8nuyCiu1SNxPq">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<captionBounds value="182,72,67,14"/>
+					<captionInternalWidth value="-2147483648"/>
+					<captionInternalHeight value="-2147483648"/>
+					<captionVisible value="true"/>
+					<captionSide value="1"/>
+					<properties>
+						<abackground value="Cr:122,207,245,255"/>
+						<aforeground value="Cr:0,0,0,255"/>
+						<azOrder value="-1"/>
+						<acreatorDiagramType value="ClassDiagram"/>
+						<aselectable value="true"/>
+						<arequestResetCaption value="false"/>
+						<arequestResetCaptionSize value="false"/>
+						<aconnectorStyle value="3"/>
+						<aconnectorLineJumps value="4"/>
+						<aconnectorLabelOrientation value="4"/>
+						<afromShapeXDiff value="0"/>
+						<afromShapeYDiff value="0"/>
+						<atoShapeXDiff value="0"/>
+						<atoShapeYDiff value="0"/>
+						<afromConnectType value="0"/>
+						<atoConnectType value="0"/>
+						<auseFromShapeCenter value="true"/>
+						<auseToShapeCenter value="true"/>
+						<afromPinType value="1"/>
+						<atoPinType value="1"/>
+						<arequestRebuild value="false"/>
+						<ashowConnectorName value="2"/>
+						<apaintThroughLabel value="2"/>
+						<ahasRoleAShape value="false"/>
+						<ahasRoleBShape value="false"/>
+						<ashowMultiplicityConstraints value="false"/>
+						<ahasMultiplicityAShape value="false"/>
+						<ahasMultiplicityBShape value="false"/>
+						<a0SwDr value="false"/>
+						<ashowStereotypes value="true"/>
+						<ashowFromRoleName value="true"/>
+						<ashowToRoleName value="true"/>
+						<ashowFromMultiplicity value="true"/>
+						<ashowToMultiplicity value="true"/>
+						<ashowFromRoleVisibility value="true"/>
+						<ashowToRoleVisibility value="true"/>
+						<ashowAssociationEndPropertyStrings value="false"/>
+						<ahasAssociationEndPropertyStringsAShape value="false"/>
+						<ahasAssociationEndPropertyStringsBShape value="false"/>
+						<afromRoleInternalWidth value="-2147483648"/>
+						<afromRoleInternalHeight value="-2147483648"/>
+						<atoRoleInternalWidth value="-2147483648"/>
+						<atoRoleInternalHeight value="-2147483648"/>
+						<afromMultiplicityInternalWidth value="-2147483648"/>
+						<afromMultiplicityInternalHeight value="-2147483648"/>
+						<atoMultiplicityInternalWidth value="-2147483648"/>
+						<atoMultiplicityInternalHeight value="-2147483648"/>
+						<aassociationEndPropertyStringsAInternalWidth value="-2147483648"/>
+						<aassociationEndPropertyStringsAInternalHeight value="-2147483648"/>
+						<aassociationEndPropertyStringsBInternalWidth value="-2147483648"/>
+						<aassociationEndPropertyStringsBInternalHeight value="-2147483648"/>
+					</properties>
+				</xmi:Extension>
+				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
+				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
+			</uml:DiagramElement>
+			<uml:DiagramElement geometry="96,301,80,40" preferredShapeType="Class" subject="Ftn8nuyCiu1SNxQP" xmi:id="5tn8nuyCiu1SNxQO">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<captionBounds value="0,0,80,14"/>
 					<captionInternalWidth value="-2147483648"/>
 					<captionInternalHeight value="-2147483648"/>
 					<captionVisible value="true"/>
@@ -9562,116 +11783,9 @@
 				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
 				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
 			</uml:DiagramElement>
-			<uml:DiagramElement geometry="450,290;340,380;" preferredShapeType="Generalization" subject="6eo0.uyCiu1SNwZp" xmi:id="6eo0.uyCiu1SNwZq">
-				<xmi:Extension extender="Visual Paradigm for UML">
-					<captionBounds value="385,330,20,0"/>
-					<captionInternalWidth value="-2147483648"/>
-					<captionInternalHeight value="-2147483648"/>
-					<captionVisible value="true"/>
-					<captionSide value="1"/>
-					<properties>
-						<abackground value="Cr:255,255,255,255"/>
-						<aforeground value="Cr:0,0,0,255"/>
-						<azOrder value="-1"/>
-						<acreatorDiagramType value="ClassDiagram"/>
-						<aselectable value="true"/>
-						<arequestResetCaption value="false"/>
-						<arequestResetCaptionSize value="false"/>
-						<aconnectorStyle value="3"/>
-						<aconnectorLineJumps value="4"/>
-						<aconnectorLabelOrientation value="4"/>
-						<afromShapeXDiff value="0"/>
-						<afromShapeYDiff value="0"/>
-						<atoShapeXDiff value="0"/>
-						<atoShapeYDiff value="0"/>
-						<afromConnectType value="0"/>
-						<atoConnectType value="0"/>
-						<auseFromShapeCenter value="true"/>
-						<auseToShapeCenter value="true"/>
-						<afromPinType value="1"/>
-						<atoPinType value="1"/>
-						<arequestRebuild value="false"/>
-						<ashowConnectorName value="2"/>
-						<apaintThroughLabel value="2"/>
-					</properties>
-				</xmi:Extension>
-				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
-				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
-			</uml:DiagramElement>
-			<uml:DiagramElement geometry="450,270;200,381;" preferredShapeType="Generalization" subject="cW40.uyCiu1SNwZt" xmi:id="8W40.uyCiu1SNwZu">
-				<xmi:Extension extender="Visual Paradigm for UML">
-					<captionBounds value="316,320,20,0"/>
-					<captionInternalWidth value="-2147483648"/>
-					<captionInternalHeight value="-2147483648"/>
-					<captionVisible value="true"/>
-					<captionSide value="1"/>
-					<properties>
-						<abackground value="Cr:255,255,255,255"/>
-						<aforeground value="Cr:0,0,0,255"/>
-						<azOrder value="-1"/>
-						<acreatorDiagramType value="ClassDiagram"/>
-						<aselectable value="true"/>
-						<arequestResetCaption value="false"/>
-						<arequestResetCaptionSize value="false"/>
-						<aconnectorStyle value="3"/>
-						<aconnectorLineJumps value="4"/>
-						<aconnectorLabelOrientation value="4"/>
-						<afromShapeXDiff value="0"/>
-						<afromShapeYDiff value="0"/>
-						<atoShapeXDiff value="0"/>
-						<atoShapeYDiff value="0"/>
-						<afromConnectType value="0"/>
-						<atoConnectType value="0"/>
-						<auseFromShapeCenter value="true"/>
-						<auseToShapeCenter value="true"/>
-						<afromPinType value="1"/>
-						<atoPinType value="1"/>
-						<arequestRebuild value="false"/>
-						<ashowConnectorName value="2"/>
-						<apaintThroughLabel value="2"/>
-					</properties>
-				</xmi:Extension>
-				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
-				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
-			</uml:DiagramElement>
-			<uml:DiagramElement geometry="330,170;280,380;" preferredShapeType="AssociationClass" subject="tqk0.uyCiu1SNwZx" xmi:id="tqk0.uyCiu1SNwZy">
-				<xmi:Extension extender="Visual Paradigm for UML">
-					<captionBounds value="316,294,20,0"/>
-					<captionInternalWidth value="-2147483648"/>
-					<captionInternalHeight value="-2147483648"/>
-					<captionVisible value="true"/>
-					<captionSide value="1"/>
-					<properties>
-						<abackground value="Cr:122,207,245,255"/>
-						<aforeground value="Cr:0,0,0,255"/>
-						<azOrder value="-1"/>
-						<aselectable value="true"/>
-						<arequestResetCaption value="false"/>
-						<arequestResetCaptionSize value="false"/>
-						<aconnectorStyle value="3"/>
-						<aconnectorLineJumps value="4"/>
-						<aconnectorLabelOrientation value="4"/>
-						<afromShapeXDiff value="0"/>
-						<afromShapeYDiff value="0"/>
-						<atoShapeXDiff value="0"/>
-						<atoShapeYDiff value="0"/>
-						<afromConnectType value="0"/>
-						<atoConnectType value="0"/>
-						<auseFromShapeCenter value="true"/>
-						<auseToShapeCenter value="true"/>
-						<afromPinType value="1"/>
-						<atoPinType value="1"/>
-						<arequestRebuild value="false"/>
-						<ashowConnectorName value="2"/>
-						<apaintThroughLabel value="2"/>
-					</properties>
-				</xmi:Extension>
-				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
-				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
-			</uml:DiagramElement>
-			<uml:DiagramElement geometry="300,180;130,380;" preferredShapeType="AssociationClass" subject="blc0.uyCiu1SNwZ3" xmi:id="7lc0.uyCiu1SNwZ4">
-				<xmi:Extension extender="Visual Paradigm for UML">
-					<captionBounds value="225,300,20,0"/>
+			<uml:DiagramElement geometry="244,183;176,301;" preferredShapeType="AssociationClass" subject="P7f8nuyCiu1SNxQU" xmi:id="v7f8nuyCiu1SNxQV">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<captionBounds value="220,262,20,0"/>
 					<captionInternalWidth value="-2147483648"/>
 					<captionInternalHeight value="-2147483648"/>
 					<captionVisible value="true"/>
@@ -9711,7 +11825,7 @@
 			<properties>
 				<apmAuthor value="lavm"/>
 				<apmCreateDateTime value="1337357128123"/>
-				<apmLastModified value="1337357599063"/>
+				<apmLastModified value="1337875866515"/>
 				<ashowPackageNameStyle value="0"/>
 				<ashowConnectorName value="0"/>
 				<apaintConnectorThroughLabel value="0"/>
@@ -9829,7 +11943,7 @@
 				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
 				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
 			</uml:DiagramElement>
-			<uml:DiagramElement geometry="570,130,80,80" preferredShapeType="Class" subject="vTljmuyEwTiAAgLp" xmi:id="MS1NBuyCiu1SNweP">
+			<uml:DiagramElement geometry="400,130,80,80" preferredShapeType="Class" subject="vTljmuyEwTiAAgLp" xmi:id="MS1NBuyCiu1SNweP">
 				<xmi:Extension extender="Visual Paradigm for UML">
 					<captionBounds value="0,0,80,14"/>
 					<captionInternalWidth value="-2147483648"/>
@@ -9839,7 +11953,7 @@
 					<properties>
 						<abackground value="Cr:122,207,245,255"/>
 						<aforeground value="Cr:0,0,0,255"/>
-						<azOrder value="3"/>
+						<azOrder value="2"/>
 						<aselectable value="true"/>
 						<arequestResetCaption value="false"/>
 						<arequestResetCaptionSize value="false"/>
@@ -9893,7 +12007,7 @@
 				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
 				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
 			</uml:DiagramElement>
-			<uml:DiagramElement geometry="170,380,80,50" preferredShapeType="Class" subject="2VbNBuyCiu1SNwe6" xmi:id="R8ItBuyCiu1SNwfd">
+			<uml:DiagramElement geometry="170,290,80,50" preferredShapeType="Class" subject="2VbNBuyCiu1SNwe6" xmi:id="R8ItBuyCiu1SNwfd">
 				<xmi:Extension extender="Visual Paradigm for UML">
 					<captionBounds value="0,0,80,14"/>
 					<captionInternalWidth value="-2147483648"/>
@@ -9957,73 +12071,9 @@
 				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
 				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
 			</uml:DiagramElement>
-			<uml:DiagramElement geometry="569,150;250,150;" preferredShapeType="Association" subject="GNitBuyCiu1SNwfx" xmi:id="mNitBuyCiu1SNwf2">
-				<xmi:Extension extender="Visual Paradigm for UML">
-					<captionBounds value="387,130,46,14"/>
-					<captionInternalWidth value="-2147483648"/>
-					<captionInternalHeight value="-2147483648"/>
-					<captionVisible value="true"/>
-					<captionSide value="1"/>
-					<properties>
-						<abackground value="Cr:122,207,245,255"/>
-						<aforeground value="Cr:0,0,0,255"/>
-						<azOrder value="-1"/>
-						<acreatorDiagramType value="ClassDiagram"/>
-						<aselectable value="true"/>
-						<arequestResetCaption value="false"/>
-						<arequestResetCaptionSize value="false"/>
-						<aconnectorStyle value="3"/>
-						<aconnectorLineJumps value="4"/>
-						<aconnectorLabelOrientation value="4"/>
-						<afromShapeXDiff value="0"/>
-						<afromShapeYDiff value="0"/>
-						<atoShapeXDiff value="0"/>
-						<atoShapeYDiff value="0"/>
-						<afromConnectType value="0"/>
-						<atoConnectType value="0"/>
-						<auseFromShapeCenter value="true"/>
-						<auseToShapeCenter value="true"/>
-						<afromPinType value="1"/>
-						<atoPinType value="1"/>
-						<arequestRebuild value="false"/>
-						<ashowConnectorName value="2"/>
-						<apaintThroughLabel value="2"/>
-						<ahasRoleAShape value="false"/>
-						<ahasRoleBShape value="false"/>
-						<ashowMultiplicityConstraints value="false"/>
-						<ahasMultiplicityAShape value="false"/>
-						<ahasMultiplicityBShape value="false"/>
-						<a0SwDr value="false"/>
-						<ashowStereotypes value="true"/>
-						<ashowFromRoleName value="true"/>
-						<ashowToRoleName value="true"/>
-						<ashowFromMultiplicity value="true"/>
-						<ashowToMultiplicity value="true"/>
-						<ashowFromRoleVisibility value="true"/>
-						<ashowToRoleVisibility value="true"/>
-						<ashowAssociationEndPropertyStrings value="false"/>
-						<ahasAssociationEndPropertyStringsAShape value="false"/>
-						<ahasAssociationEndPropertyStringsBShape value="false"/>
-						<afromRoleInternalWidth value="-2147483648"/>
-						<afromRoleInternalHeight value="-2147483648"/>
-						<atoRoleInternalWidth value="-2147483648"/>
-						<atoRoleInternalHeight value="-2147483648"/>
-						<afromMultiplicityInternalWidth value="-2147483648"/>
-						<afromMultiplicityInternalHeight value="-2147483648"/>
-						<atoMultiplicityInternalWidth value="-2147483648"/>
-						<atoMultiplicityInternalHeight value="-2147483648"/>
-						<aassociationEndPropertyStringsAInternalWidth value="-2147483648"/>
-						<aassociationEndPropertyStringsAInternalHeight value="-2147483648"/>
-						<aassociationEndPropertyStringsBInternalWidth value="-2147483648"/>
-						<aassociationEndPropertyStringsBInternalHeight value="-2147483648"/>
-					</properties>
-				</xmi:Extension>
-				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
-				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
-			</uml:DiagramElement>
-			<uml:DiagramElement geometry="250,170;569,170;" preferredShapeType="Association" subject="Wo6tBuyCiu1SNwf." xmi:id="2o6tBuyCiu1SNwgD">
-				<xmi:Extension extender="Visual Paradigm for UML">
-					<captionBounds value="360,180,108,14"/>
+			<uml:DiagramElement geometry="399,150;250,150;" preferredShapeType="Association" subject="GNitBuyCiu1SNwfx" xmi:id="mNitBuyCiu1SNwf2">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<captionBounds value="302,130,46,14"/>
 					<captionInternalWidth value="-2147483648"/>
 					<captionInternalHeight value="-2147483648"/>
 					<captionVisible value="true"/>
@@ -10085,9 +12135,9 @@
 				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
 				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
 			</uml:DiagramElement>
-			<uml:DiagramElement geometry="210,180;210,379;" preferredShapeType="Association" subject="6.htBuyCiu1SNwgL" xmi:id="6.htBuyCiu1SNwgQ">
-				<xmi:Extension extender="Visual Paradigm for UML">
-					<captionBounds value="210,272,108,14"/>
+			<uml:DiagramElement geometry="250,170;399,170;" preferredShapeType="Association" subject="Wo6tBuyCiu1SNwf." xmi:id="2o6tBuyCiu1SNwgD">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<captionBounds value="270,180,108,14"/>
 					<captionInternalWidth value="-2147483648"/>
 					<captionInternalHeight value="-2147483648"/>
 					<captionVisible value="true"/>
@@ -10149,9 +12199,9 @@
 				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
 				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
 			</uml:DiagramElement>
-			<uml:DiagramElement geometry="570,209;250,381;" preferredShapeType="Association" subject="Uf5tBuyCiu1SNwgY" xmi:id="0f5tBuyCiu1SNwgd">
-				<xmi:Extension extender="Visual Paradigm for UML">
-					<captionBounds value="430,290,121,14"/>
+			<uml:DiagramElement geometry="240,180;240,289;" preferredShapeType="Association" subject="6.htBuyCiu1SNwgL" xmi:id="6.htBuyCiu1SNwgQ">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<captionBounds value="140,220,108,14"/>
 					<captionInternalWidth value="-2147483648"/>
 					<captionInternalHeight value="-2147483648"/>
 					<captionVisible value="true"/>
@@ -10213,9 +12263,9 @@
 				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
 				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
 			</uml:DiagramElement>
-			<uml:DiagramElement geometry="210,129;210,90;100,90;100,155;169,155;" preferredShapeType="Association" subject="CNrtBuyCiu1SNwgz" xmi:id="CNrtBuyCiu1SNwg4">
-				<xmi:Extension extender="Visual Paradigm for UML">
-					<captionBounds value="80,60,108,14"/>
+			<uml:DiagramElement geometry="400,209;250,291;" preferredShapeType="Association" subject="Uf5tBuyCiu1SNwgY" xmi:id="0f5tBuyCiu1SNwgd">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<captionBounds value="319,260,121,14"/>
 					<captionInternalWidth value="-2147483648"/>
 					<captionInternalHeight value="-2147483648"/>
 					<captionVisible value="true"/>
@@ -10277,9 +12327,137 @@
 				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
 				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
 			</uml:DiagramElement>
-			<uml:DiagramElement geometry="210,430;210,470;290,470;290,405;250,405;" preferredShapeType="Association" subject="CqftBuyCiu1SNwhD" xmi:id="CqftBuyCiu1SNwhI">
-				<xmi:Extension extender="Visual Paradigm for UML">
-					<captionBounds value="200,480,109,14"/>
+			<uml:DiagramElement geometry="210,129;210,90;120,90;120,150;169,150;" preferredShapeType="Association" subject="CNrtBuyCiu1SNwgz" xmi:id="CNrtBuyCiu1SNwg4">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<captionBounds value="110,60,108,14"/>
+					<captionInternalWidth value="-2147483648"/>
+					<captionInternalHeight value="-2147483648"/>
+					<captionVisible value="true"/>
+					<captionSide value="1"/>
+					<properties>
+						<abackground value="Cr:122,207,245,255"/>
+						<aforeground value="Cr:0,0,0,255"/>
+						<azOrder value="-1"/>
+						<acreatorDiagramType value="ClassDiagram"/>
+						<aselectable value="true"/>
+						<arequestResetCaption value="false"/>
+						<arequestResetCaptionSize value="false"/>
+						<aconnectorStyle value="3"/>
+						<aconnectorLineJumps value="4"/>
+						<aconnectorLabelOrientation value="4"/>
+						<afromShapeXDiff value="0"/>
+						<afromShapeYDiff value="0"/>
+						<atoShapeXDiff value="0"/>
+						<atoShapeYDiff value="0"/>
+						<afromConnectType value="0"/>
+						<atoConnectType value="0"/>
+						<auseFromShapeCenter value="true"/>
+						<auseToShapeCenter value="true"/>
+						<afromPinType value="1"/>
+						<atoPinType value="1"/>
+						<arequestRebuild value="false"/>
+						<ashowConnectorName value="2"/>
+						<apaintThroughLabel value="2"/>
+						<ahasRoleAShape value="false"/>
+						<ahasRoleBShape value="false"/>
+						<ashowMultiplicityConstraints value="false"/>
+						<ahasMultiplicityAShape value="false"/>
+						<ahasMultiplicityBShape value="false"/>
+						<a0SwDr value="false"/>
+						<ashowStereotypes value="true"/>
+						<ashowFromRoleName value="true"/>
+						<ashowToRoleName value="true"/>
+						<ashowFromMultiplicity value="true"/>
+						<ashowToMultiplicity value="true"/>
+						<ashowFromRoleVisibility value="true"/>
+						<ashowToRoleVisibility value="true"/>
+						<ashowAssociationEndPropertyStrings value="false"/>
+						<ahasAssociationEndPropertyStringsAShape value="false"/>
+						<ahasAssociationEndPropertyStringsBShape value="false"/>
+						<afromRoleInternalWidth value="-2147483648"/>
+						<afromRoleInternalHeight value="-2147483648"/>
+						<atoRoleInternalWidth value="-2147483648"/>
+						<atoRoleInternalHeight value="-2147483648"/>
+						<afromMultiplicityInternalWidth value="-2147483648"/>
+						<afromMultiplicityInternalHeight value="-2147483648"/>
+						<atoMultiplicityInternalWidth value="-2147483648"/>
+						<atoMultiplicityInternalHeight value="-2147483648"/>
+						<aassociationEndPropertyStringsAInternalWidth value="-2147483648"/>
+						<aassociationEndPropertyStringsAInternalHeight value="-2147483648"/>
+						<aassociationEndPropertyStringsBInternalWidth value="-2147483648"/>
+						<aassociationEndPropertyStringsBInternalHeight value="-2147483648"/>
+					</properties>
+				</xmi:Extension>
+				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
+				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
+			</uml:DiagramElement>
+			<uml:DiagramElement geometry="210,340;210,360;290,360;290,310;250,310;" preferredShapeType="Association" subject="CqftBuyCiu1SNwhD" xmi:id="CqftBuyCiu1SNwhI">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<captionBounds value="190,380,109,14"/>
+					<captionInternalWidth value="-2147483648"/>
+					<captionInternalHeight value="-2147483648"/>
+					<captionVisible value="true"/>
+					<captionSide value="1"/>
+					<properties>
+						<abackground value="Cr:122,207,245,255"/>
+						<aforeground value="Cr:0,0,0,255"/>
+						<azOrder value="-1"/>
+						<acreatorDiagramType value="ClassDiagram"/>
+						<aselectable value="true"/>
+						<arequestResetCaption value="false"/>
+						<arequestResetCaptionSize value="false"/>
+						<aconnectorStyle value="3"/>
+						<aconnectorLineJumps value="4"/>
+						<aconnectorLabelOrientation value="4"/>
+						<afromShapeXDiff value="0"/>
+						<afromShapeYDiff value="0"/>
+						<atoShapeXDiff value="0"/>
+						<atoShapeYDiff value="0"/>
+						<afromConnectType value="0"/>
+						<atoConnectType value="0"/>
+						<auseFromShapeCenter value="true"/>
+						<auseToShapeCenter value="true"/>
+						<afromPinType value="1"/>
+						<atoPinType value="1"/>
+						<arequestRebuild value="false"/>
+						<ashowConnectorName value="2"/>
+						<apaintThroughLabel value="2"/>
+						<ahasRoleAShape value="false"/>
+						<ahasRoleBShape value="false"/>
+						<ashowMultiplicityConstraints value="false"/>
+						<ahasMultiplicityAShape value="false"/>
+						<ahasMultiplicityBShape value="false"/>
+						<a0SwDr value="false"/>
+						<ashowStereotypes value="true"/>
+						<ashowFromRoleName value="true"/>
+						<ashowToRoleName value="true"/>
+						<ashowFromMultiplicity value="true"/>
+						<ashowToMultiplicity value="true"/>
+						<ashowFromRoleVisibility value="true"/>
+						<ashowToRoleVisibility value="true"/>
+						<ashowAssociationEndPropertyStrings value="false"/>
+						<ahasAssociationEndPropertyStringsAShape value="false"/>
+						<ahasAssociationEndPropertyStringsBShape value="false"/>
+						<afromRoleInternalWidth value="-2147483648"/>
+						<afromRoleInternalHeight value="-2147483648"/>
+						<atoRoleInternalWidth value="-2147483648"/>
+						<atoRoleInternalHeight value="-2147483648"/>
+						<afromMultiplicityInternalWidth value="-2147483648"/>
+						<afromMultiplicityInternalHeight value="-2147483648"/>
+						<atoMultiplicityInternalWidth value="-2147483648"/>
+						<atoMultiplicityInternalHeight value="-2147483648"/>
+						<aassociationEndPropertyStringsAInternalWidth value="-2147483648"/>
+						<aassociationEndPropertyStringsAInternalHeight value="-2147483648"/>
+						<aassociationEndPropertyStringsBInternalWidth value="-2147483648"/>
+						<aassociationEndPropertyStringsBInternalHeight value="-2147483648"/>
+					</properties>
+				</xmi:Extension>
+				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
+				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
+			</uml:DiagramElement>
+			<uml:DiagramElement geometry="440,129;440,90;520,90;520,170;480,170;" preferredShapeType="Association" subject="1MC5_uyCiu1SNxbJ" xmi:id="1MC5_uyCiu1SNxbO">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<captionBounds value="430,60,102,14"/>
 					<captionInternalWidth value="-2147483648"/>
 					<captionInternalHeight value="-2147483648"/>
 					<captionVisible value="true"/>
@@ -10348,7 +12526,7 @@
 			<properties>
 				<apmAuthor value="lavm"/>
 				<apmCreateDateTime value="1337357192244"/>
-				<apmLastModified value="1337357245621"/>
+				<apmLastModified value="1337806282245"/>
 				<ashowPackageNameStyle value="0"/>
 				<ashowConnectorName value="0"/>
 				<apaintConnectorThroughLabel value="0"/>
@@ -10359,7 +12537,7 @@
 				<ashowTaggedValues value="false"/>
 				<ashowStereotypes value="true"/>
 				<ashowConstraints value="false"/>
-				<aalignToGrid value="true"/>
+				<aalignToGrid value="false"/>
 				<agridVisible value="false"/>
 				<agridWidth value="10"/>
 				<agridHeight value="10"/>
@@ -10402,7 +12580,7 @@
 			</properties>
 		</xmi:Extension>
 		<uml:Diagram.element>
-			<uml:DiagramElement geometry="460,140,80,50" preferredShapeType="Class" subject="2VbNBuyCiu1SNwe6" xmi:id="WVbNBuyCiu1SNwe5">
+			<uml:DiagramElement geometry="370,140,80,50" preferredShapeType="Class" subject="2VbNBuyCiu1SNwe6" xmi:id="WVbNBuyCiu1SNwe5">
 				<xmi:Extension extender="Visual Paradigm for UML">
 					<captionBounds value="0,0,80,14"/>
 					<captionInternalWidth value="-2147483648"/>
@@ -10412,7 +12590,7 @@
 					<properties>
 						<abackground value="Cr:122,207,245,255"/>
 						<aforeground value="Cr:0,0,0,255"/>
-						<azOrder value="0"/>
+						<azOrder value="20"/>
 						<acreatorDiagramType value="ClassDiagram"/>
 						<aselectable value="true"/>
 						<arequestResetCaption value="false"/>
@@ -10467,6 +12645,3324 @@
 				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
 				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
 			</uml:DiagramElement>
+			<uml:DiagramElement geometry="140,140,80,80" preferredShapeType="Class" subject="vTljmuyEwTiAAgLp" xmi:id="ho2hzuyCiu1SNwwh">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<captionBounds value="0,0,80,14"/>
+					<captionInternalWidth value="-2147483648"/>
+					<captionInternalHeight value="-2147483648"/>
+					<captionVisible value="true"/>
+					<captionSide value="12"/>
+					<properties>
+						<abackground value="Cr:122,207,245,255"/>
+						<aforeground value="Cr:0,0,0,255"/>
+						<azOrder value="18"/>
+						<aselectable value="true"/>
+						<arequestResetCaption value="false"/>
+						<arequestResetCaptionSize value="false"/>
+						<adisplayStereotypeIcon value="false"/>
+						<aoverrideAppearanceWithStereotypeIcon value="true"/>
+						<arequestSetSizeOption value="0"/>
+						<aparentConnectorHeaderLength value="40"/>
+						<aparentConnectorLineLength value="10"/>
+						<aconnectToPoint value="true"/>
+						<aparentConnectorDTheta value="0.0"/>
+						<aconnectionPointType value="2"/>
+						<amodelElementNameAlignment value="9"/>
+						<arequestDefaultSize value="false"/>
+						<arequestFitSize value="false"/>
+						<arequestFitSizeFromCenter value="false"/>
+						<adisplayAsRobustnessAnalysisIcon value="true"/>
+						<avisibilityStyle value="1"/>
+						<ashowAttributeType value="1"/>
+						<ashowOperationType value="1"/>
+						<amSwTpPts value="true"/>
+						<alshRfAts value="true"/>
+						<amShDrAt value="false"/>
+						<akShDrOp value="false"/>
+						<akSwCsMbSt value="true"/>
+						<ashowClassMemberConstraints value="true"/>
+						<alShCmMl value="false"/>
+						<ashowOperationParameterDirection value="false"/>
+						<ashowOperationRaisedExceptions value="false"/>
+						<ashowParameterNameInOperationSignature value="true"/>
+						<ashowOperationTemplateParameters value="false"/>
+						<ashowOperationProperties value="false"/>
+						<awpMbs value="false"/>
+						<aattributeSortType value="0"/>
+						<aoperationSortType value="0"/>
+						<ashowInitialAttributeValue value="true"/>
+						<ashowOperationSignature value="true"/>
+						<ainterfaceBall value="false"/>
+						<ashowEmptyCompartments value="0"/>
+						<ashowEllipsisForUnshownMembers value="0"/>
+						<ashowAttributesCodeDetails value="0"/>
+						<ashowOperationsCodeDetails value="0"/>
+						<ashowParametersCodeDetails value="0"/>
+						<ashowTypeOption value="0"/>
+						<ashowOwnerOption value="3"/>
+						<ashowAttributesType value="0"/>
+						<ashowOperationsParameters value="0"/>
+						<ashowOperationsReturnType value="0"/>
+					</properties>
+				</xmi:Extension>
+				<elementFill color1="Cr:122,207,245,255" color2="" style="1" transparency="0" type="1"/>
+				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
+				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
+			</uml:DiagramElement>
+			<uml:DiagramElement geometry="220,170;369,170;" preferredShapeType="Association" subject="Uf5tBuyCiu1SNwgY" xmi:id="xo2hzuyCiu1SNwwj">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<captionBounds value="230,151,122,14"/>
+					<captionInternalWidth value="-2147483648"/>
+					<captionInternalHeight value="-2147483648"/>
+					<captionVisible value="true"/>
+					<captionSide value="1"/>
+					<properties>
+						<abackground value="Cr:122,207,245,255"/>
+						<aforeground value="Cr:0,0,0,255"/>
+						<azOrder value="-1"/>
+						<aselectable value="true"/>
+						<arequestResetCaption value="false"/>
+						<arequestResetCaptionSize value="false"/>
+						<aconnectorStyle value="3"/>
+						<aconnectorLineJumps value="4"/>
+						<aconnectorLabelOrientation value="4"/>
+						<afromShapeXDiff value="0"/>
+						<afromShapeYDiff value="0"/>
+						<atoShapeXDiff value="0"/>
+						<atoShapeYDiff value="0"/>
+						<afromConnectType value="0"/>
+						<atoConnectType value="0"/>
+						<auseFromShapeCenter value="true"/>
+						<auseToShapeCenter value="true"/>
+						<afromPinType value="1"/>
+						<atoPinType value="1"/>
+						<arequestRebuild value="false"/>
+						<ashowConnectorName value="2"/>
+						<apaintThroughLabel value="2"/>
+						<ahasRoleAShape value="false"/>
+						<ahasRoleBShape value="false"/>
+						<ashowMultiplicityConstraints value="false"/>
+						<ahasMultiplicityAShape value="false"/>
+						<ahasMultiplicityBShape value="false"/>
+						<a0SwDr value="false"/>
+						<ashowStereotypes value="true"/>
+						<ashowFromRoleName value="true"/>
+						<ashowToRoleName value="true"/>
+						<ashowFromMultiplicity value="true"/>
+						<ashowToMultiplicity value="true"/>
+						<ashowFromRoleVisibility value="true"/>
+						<ashowToRoleVisibility value="true"/>
+						<ashowAssociationEndPropertyStrings value="false"/>
+						<ahasAssociationEndPropertyStringsAShape value="false"/>
+						<ahasAssociationEndPropertyStringsBShape value="false"/>
+						<afromRoleInternalWidth value="-2147483648"/>
+						<afromRoleInternalHeight value="-2147483648"/>
+						<atoRoleInternalWidth value="-2147483648"/>
+						<atoRoleInternalHeight value="-2147483648"/>
+						<afromMultiplicityInternalWidth value="-2147483648"/>
+						<afromMultiplicityInternalHeight value="-2147483648"/>
+						<atoMultiplicityInternalWidth value="-2147483648"/>
+						<atoMultiplicityInternalHeight value="-2147483648"/>
+						<aassociationEndPropertyStringsAInternalWidth value="-2147483648"/>
+						<aassociationEndPropertyStringsAInternalHeight value="-2147483648"/>
+						<aassociationEndPropertyStringsBInternalWidth value="-2147483648"/>
+						<aassociationEndPropertyStringsBInternalHeight value="-2147483648"/>
+					</properties>
+				</xmi:Extension>
+				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
+				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
+			</uml:DiagramElement>
+			<uml:DiagramElement geometry="640,140,80,50" preferredShapeType="Class" subject="m6xjmuyEwTiAAgLk" xmi:id="XmhhzuyCiu1SNwwx">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<captionBounds value="0,0,80,14"/>
+					<captionInternalWidth value="-2147483648"/>
+					<captionInternalHeight value="-2147483648"/>
+					<captionVisible value="true"/>
+					<captionSide value="12"/>
+					<properties>
+						<abackground value="Cr:122,207,245,255"/>
+						<aforeground value="Cr:0,0,0,255"/>
+						<azOrder value="16"/>
+						<aselectable value="true"/>
+						<arequestResetCaption value="false"/>
+						<arequestResetCaptionSize value="false"/>
+						<adisplayStereotypeIcon value="false"/>
+						<aoverrideAppearanceWithStereotypeIcon value="true"/>
+						<arequestSetSizeOption value="0"/>
+						<aparentConnectorHeaderLength value="40"/>
+						<aparentConnectorLineLength value="10"/>
+						<aconnectToPoint value="true"/>
+						<aparentConnectorDTheta value="0.0"/>
+						<aconnectionPointType value="2"/>
+						<amodelElementNameAlignment value="9"/>
+						<arequestDefaultSize value="false"/>
+						<arequestFitSize value="false"/>
+						<arequestFitSizeFromCenter value="false"/>
+						<adisplayAsRobustnessAnalysisIcon value="true"/>
+						<avisibilityStyle value="1"/>
+						<ashowAttributeType value="1"/>
+						<ashowOperationType value="1"/>
+						<amSwTpPts value="true"/>
+						<alshRfAts value="true"/>
+						<amShDrAt value="false"/>
+						<akShDrOp value="false"/>
+						<akSwCsMbSt value="true"/>
+						<ashowClassMemberConstraints value="true"/>
+						<alShCmMl value="false"/>
+						<ashowOperationParameterDirection value="false"/>
+						<ashowOperationRaisedExceptions value="false"/>
+						<ashowParameterNameInOperationSignature value="true"/>
+						<ashowOperationTemplateParameters value="false"/>
+						<ashowOperationProperties value="false"/>
+						<awpMbs value="false"/>
+						<aattributeSortType value="0"/>
+						<aoperationSortType value="0"/>
+						<ashowInitialAttributeValue value="true"/>
+						<ashowOperationSignature value="true"/>
+						<ainterfaceBall value="false"/>
+						<ashowEmptyCompartments value="0"/>
+						<ashowEllipsisForUnshownMembers value="0"/>
+						<ashowAttributesCodeDetails value="0"/>
+						<ashowOperationsCodeDetails value="0"/>
+						<ashowParametersCodeDetails value="0"/>
+						<ashowTypeOption value="0"/>
+						<ashowOwnerOption value="3"/>
+						<ashowAttributesType value="0"/>
+						<ashowOperationsParameters value="0"/>
+						<ashowOperationsReturnType value="0"/>
+					</properties>
+				</xmi:Extension>
+				<elementFill color1="Cr:122,207,245,255" color2="" style="1" transparency="0" type="1"/>
+				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
+				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
+			</uml:DiagramElement>
+			<uml:DiagramElement geometry="639,160;450,160;" preferredShapeType="Association" subject="6.htBuyCiu1SNwgL" xmi:id="PmhhzuyCiu1SNww3">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<captionBounds value="488,143,108,14"/>
+					<captionInternalWidth value="-2147483648"/>
+					<captionInternalHeight value="-2147483648"/>
+					<captionVisible value="true"/>
+					<captionSide value="1"/>
+					<properties>
+						<abackground value="Cr:122,207,245,255"/>
+						<aforeground value="Cr:0,0,0,255"/>
+						<azOrder value="-1"/>
+						<aselectable value="true"/>
+						<arequestResetCaption value="false"/>
+						<arequestResetCaptionSize value="false"/>
+						<aconnectorStyle value="3"/>
+						<aconnectorLineJumps value="4"/>
+						<aconnectorLabelOrientation value="4"/>
+						<afromShapeXDiff value="0"/>
+						<afromShapeYDiff value="0"/>
+						<atoShapeXDiff value="0"/>
+						<atoShapeYDiff value="0"/>
+						<afromConnectType value="0"/>
+						<atoConnectType value="0"/>
+						<auseFromShapeCenter value="true"/>
+						<auseToShapeCenter value="true"/>
+						<afromPinType value="1"/>
+						<atoPinType value="1"/>
+						<arequestRebuild value="false"/>
+						<ashowConnectorName value="2"/>
+						<apaintThroughLabel value="2"/>
+						<ahasRoleAShape value="false"/>
+						<ahasRoleBShape value="false"/>
+						<ashowMultiplicityConstraints value="false"/>
+						<ahasMultiplicityAShape value="false"/>
+						<ahasMultiplicityBShape value="false"/>
+						<a0SwDr value="false"/>
+						<ashowStereotypes value="true"/>
+						<ashowFromRoleName value="true"/>
+						<ashowToRoleName value="true"/>
+						<ashowFromMultiplicity value="true"/>
+						<ashowToMultiplicity value="true"/>
+						<ashowFromRoleVisibility value="true"/>
+						<ashowToRoleVisibility value="true"/>
+						<ashowAssociationEndPropertyStrings value="false"/>
+						<ahasAssociationEndPropertyStringsAShape value="false"/>
+						<ahasAssociationEndPropertyStringsBShape value="false"/>
+						<afromRoleInternalWidth value="-2147483648"/>
+						<afromRoleInternalHeight value="-2147483648"/>
+						<atoRoleInternalWidth value="-2147483648"/>
+						<atoRoleInternalHeight value="-2147483648"/>
+						<afromMultiplicityInternalWidth value="-2147483648"/>
+						<afromMultiplicityInternalHeight value="-2147483648"/>
+						<atoMultiplicityInternalWidth value="-2147483648"/>
+						<atoMultiplicityInternalHeight value="-2147483648"/>
+						<aassociationEndPropertyStringsAInternalWidth value="-2147483648"/>
+						<aassociationEndPropertyStringsAInternalHeight value="-2147483648"/>
+						<aassociationEndPropertyStringsBInternalWidth value="-2147483648"/>
+						<aassociationEndPropertyStringsBInternalHeight value="-2147483648"/>
+					</properties>
+				</xmi:Extension>
+				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
+				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
+			</uml:DiagramElement>
+			<uml:DiagramElement geometry="420,190;420,230;490,230;490,180;450,180;" preferredShapeType="Association" subject="uYgRzuyCiu1SNwyI" xmi:id="eYgRzuyCiu1SNwyN">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<captionBounds value="457,232,110,14"/>
+					<captionInternalWidth value="-2147483648"/>
+					<captionInternalHeight value="-2147483648"/>
+					<captionVisible value="true"/>
+					<captionSide value="1"/>
+					<properties>
+						<abackground value="Cr:122,207,245,255"/>
+						<aforeground value="Cr:0,0,0,255"/>
+						<azOrder value="-1"/>
+						<acreatorDiagramType value="ClassDiagram"/>
+						<aselectable value="true"/>
+						<arequestResetCaption value="false"/>
+						<arequestResetCaptionSize value="false"/>
+						<aconnectorStyle value="3"/>
+						<aconnectorLineJumps value="4"/>
+						<aconnectorLabelOrientation value="4"/>
+						<afromShapeXDiff value="0"/>
+						<afromShapeYDiff value="0"/>
+						<atoShapeXDiff value="0"/>
+						<atoShapeYDiff value="0"/>
+						<afromConnectType value="0"/>
+						<atoConnectType value="0"/>
+						<auseFromShapeCenter value="true"/>
+						<auseToShapeCenter value="true"/>
+						<afromPinType value="1"/>
+						<atoPinType value="1"/>
+						<arequestRebuild value="false"/>
+						<ashowConnectorName value="2"/>
+						<apaintThroughLabel value="2"/>
+						<ahasRoleAShape value="false"/>
+						<ahasRoleBShape value="false"/>
+						<ashowMultiplicityConstraints value="false"/>
+						<ahasMultiplicityAShape value="false"/>
+						<ahasMultiplicityBShape value="false"/>
+						<a0SwDr value="false"/>
+						<ashowStereotypes value="true"/>
+						<ashowFromRoleName value="true"/>
+						<ashowToRoleName value="true"/>
+						<ashowFromMultiplicity value="true"/>
+						<ashowToMultiplicity value="true"/>
+						<ashowFromRoleVisibility value="true"/>
+						<ashowToRoleVisibility value="true"/>
+						<ashowAssociationEndPropertyStrings value="false"/>
+						<ahasAssociationEndPropertyStringsAShape value="false"/>
+						<ahasAssociationEndPropertyStringsBShape value="false"/>
+						<afromRoleInternalWidth value="-2147483648"/>
+						<afromRoleInternalHeight value="-2147483648"/>
+						<atoRoleInternalWidth value="-2147483648"/>
+						<atoRoleInternalHeight value="-2147483648"/>
+						<afromMultiplicityInternalWidth value="-2147483648"/>
+						<afromMultiplicityInternalHeight value="-2147483648"/>
+						<atoMultiplicityInternalWidth value="-2147483648"/>
+						<atoMultiplicityInternalHeight value="-2147483648"/>
+						<aassociationEndPropertyStringsAInternalWidth value="-2147483648"/>
+						<aassociationEndPropertyStringsAInternalHeight value="-2147483648"/>
+						<aassociationEndPropertyStringsBInternalWidth value="-2147483648"/>
+						<aassociationEndPropertyStringsBInternalHeight value="-2147483648"/>
+					</properties>
+				</xmi:Extension>
+				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
+				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
+			</uml:DiagramElement>
+			<uml:DiagramElement geometry="155,344,130,50" preferredShapeType="Class" subject="WdORzuyCiu1SNwzI" xmi:id="WdORzuyCiu1SNwzH">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<captionBounds value="0,0,130,14"/>
+					<captionInternalWidth value="-2147483648"/>
+					<captionInternalHeight value="-2147483648"/>
+					<captionVisible value="true"/>
+					<captionSide value="12"/>
+					<properties>
+						<abackground value="Cr:192,192,192,255"/>
+						<aforeground value="Cr:0,0,0,255"/>
+						<azOrder value="14"/>
+						<acreatorDiagramType value="ClassDiagram"/>
+						<aselectable value="true"/>
+						<arequestResetCaption value="false"/>
+						<arequestResetCaptionSize value="false"/>
+						<adisplayStereotypeIcon value="false"/>
+						<aoverrideAppearanceWithStereotypeIcon value="true"/>
+						<arequestSetSizeOption value="0"/>
+						<aparentConnectorHeaderLength value="40"/>
+						<aparentConnectorLineLength value="10"/>
+						<aconnectToPoint value="true"/>
+						<aparentConnectorDTheta value="0.0"/>
+						<aconnectionPointType value="2"/>
+						<amodelElementNameAlignment value="9"/>
+						<arequestDefaultSize value="false"/>
+						<arequestFitSize value="false"/>
+						<arequestFitSizeFromCenter value="false"/>
+						<adisplayAsRobustnessAnalysisIcon value="true"/>
+						<avisibilityStyle value="1"/>
+						<ashowAttributeType value="1"/>
+						<ashowOperationType value="1"/>
+						<amSwTpPts value="true"/>
+						<alshRfAts value="true"/>
+						<amShDrAt value="false"/>
+						<akShDrOp value="false"/>
+						<akSwCsMbSt value="true"/>
+						<ashowClassMemberConstraints value="true"/>
+						<alShCmMl value="false"/>
+						<ashowOperationParameterDirection value="false"/>
+						<ashowOperationRaisedExceptions value="false"/>
+						<ashowParameterNameInOperationSignature value="true"/>
+						<ashowOperationTemplateParameters value="false"/>
+						<ashowOperationProperties value="false"/>
+						<awpMbs value="false"/>
+						<aattributeSortType value="0"/>
+						<aoperationSortType value="0"/>
+						<ashowInitialAttributeValue value="true"/>
+						<ashowOperationSignature value="true"/>
+						<ainterfaceBall value="false"/>
+						<ashowEmptyCompartments value="0"/>
+						<ashowEllipsisForUnshownMembers value="0"/>
+						<ashowAttributesCodeDetails value="0"/>
+						<ashowOperationsCodeDetails value="0"/>
+						<ashowParametersCodeDetails value="0"/>
+						<ashowTypeOption value="0"/>
+						<ashowOwnerOption value="3"/>
+						<ashowAttributesType value="0"/>
+						<ashowOperationsParameters value="0"/>
+						<ashowOperationsReturnType value="0"/>
+					</properties>
+				</xmi:Extension>
+				<elementFill color1="Cr:192,192,192,255" color2="" style="1" transparency="0" type="1"/>
+				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
+				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
+			</uml:DiagramElement>
+			<uml:DiagramElement geometry="263,170;263,343;" preferredShapeType="AssociationClass" subject="N.hRzuyCiu1SNwzM" xmi:id="N.hRzuyCiu1SNwzN">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<captionBounds value="273,280,20,0"/>
+					<captionInternalWidth value="-2147483648"/>
+					<captionInternalHeight value="-2147483648"/>
+					<captionVisible value="true"/>
+					<captionSide value="1"/>
+					<properties>
+						<abackground value="Cr:122,207,245,255"/>
+						<aforeground value="Cr:0,0,0,255"/>
+						<azOrder value="-1"/>
+						<aselectable value="true"/>
+						<arequestResetCaption value="false"/>
+						<arequestResetCaptionSize value="false"/>
+						<aconnectorStyle value="3"/>
+						<aconnectorLineJumps value="4"/>
+						<aconnectorLabelOrientation value="4"/>
+						<afromShapeXDiff value="0"/>
+						<afromShapeYDiff value="0"/>
+						<atoShapeXDiff value="0"/>
+						<atoShapeYDiff value="0"/>
+						<afromConnectType value="0"/>
+						<atoConnectType value="0"/>
+						<auseFromShapeCenter value="true"/>
+						<auseToShapeCenter value="true"/>
+						<afromPinType value="1"/>
+						<atoPinType value="1"/>
+						<arequestRebuild value="false"/>
+						<ashowConnectorName value="2"/>
+						<apaintThroughLabel value="2"/>
+					</properties>
+				</xmi:Extension>
+				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
+				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
+			</uml:DiagramElement>
+			<uml:DiagramElement geometry="636,347,105,40" preferredShapeType="Class" subject="CIdRzuyCiu1SNwzZ" xmi:id="8IdRzuyCiu1SNwzY">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<captionBounds value="0,0,105,28"/>
+					<captionInternalWidth value="-2147483648"/>
+					<captionInternalHeight value="-2147483648"/>
+					<captionVisible value="true"/>
+					<captionSide value="12"/>
+					<properties>
+						<abackground value="Cr:179,214,249,255"/>
+						<aforeground value="Cr:0,0,0,255"/>
+						<azOrder value="12"/>
+						<acreatorDiagramType value="ClassDiagram"/>
+						<aselectable value="true"/>
+						<arequestResetCaption value="false"/>
+						<arequestResetCaptionSize value="false"/>
+						<adisplayStereotypeIcon value="false"/>
+						<aoverrideAppearanceWithStereotypeIcon value="true"/>
+						<arequestSetSizeOption value="0"/>
+						<aparentConnectorHeaderLength value="40"/>
+						<aparentConnectorLineLength value="10"/>
+						<aconnectToPoint value="true"/>
+						<aparentConnectorDTheta value="0.0"/>
+						<aconnectionPointType value="2"/>
+						<amodelElementNameAlignment value="9"/>
+						<arequestDefaultSize value="false"/>
+						<arequestFitSize value="false"/>
+						<arequestFitSizeFromCenter value="false"/>
+						<adisplayAsRobustnessAnalysisIcon value="true"/>
+						<avisibilityStyle value="1"/>
+						<ashowAttributeType value="1"/>
+						<ashowOperationType value="1"/>
+						<amSwTpPts value="true"/>
+						<alshRfAts value="true"/>
+						<amShDrAt value="false"/>
+						<akShDrOp value="false"/>
+						<akSwCsMbSt value="true"/>
+						<ashowClassMemberConstraints value="true"/>
+						<alShCmMl value="false"/>
+						<ashowOperationParameterDirection value="false"/>
+						<ashowOperationRaisedExceptions value="false"/>
+						<ashowParameterNameInOperationSignature value="true"/>
+						<ashowOperationTemplateParameters value="false"/>
+						<ashowOperationProperties value="false"/>
+						<awpMbs value="false"/>
+						<aattributeSortType value="0"/>
+						<aoperationSortType value="0"/>
+						<ashowInitialAttributeValue value="true"/>
+						<ashowOperationSignature value="true"/>
+						<ainterfaceBall value="false"/>
+						<ashowEmptyCompartments value="0"/>
+						<ashowEllipsisForUnshownMembers value="0"/>
+						<ashowAttributesCodeDetails value="0"/>
+						<ashowOperationsCodeDetails value="0"/>
+						<ashowParametersCodeDetails value="0"/>
+						<ashowTypeOption value="0"/>
+						<ashowOwnerOption value="3"/>
+						<ashowAttributesType value="0"/>
+						<ashowOperationsParameters value="0"/>
+						<ashowOperationsReturnType value="0"/>
+					</properties>
+				</xmi:Extension>
+				<elementFill color1="Cr:179,214,249,255" color2="" style="1" transparency="0" type="1"/>
+				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
+				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
+			</uml:DiagramElement>
+			<uml:DiagramElement geometry="680,190;680,346;" preferredShapeType="Generalization" subject="cELRzuyCiu1SNwzd" xmi:id="cELRzuyCiu1SNwze">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<captionBounds value="680,267,20,0"/>
+					<captionInternalWidth value="-2147483648"/>
+					<captionInternalHeight value="-2147483648"/>
+					<captionVisible value="true"/>
+					<captionSide value="1"/>
+					<properties>
+						<abackground value="Cr:255,255,255,255"/>
+						<aforeground value="Cr:0,0,0,255"/>
+						<azOrder value="-1"/>
+						<acreatorDiagramType value="ClassDiagram"/>
+						<aselectable value="true"/>
+						<arequestResetCaption value="false"/>
+						<arequestResetCaptionSize value="false"/>
+						<aconnectorStyle value="3"/>
+						<aconnectorLineJumps value="4"/>
+						<aconnectorLabelOrientation value="4"/>
+						<afromShapeXDiff value="0"/>
+						<afromShapeYDiff value="0"/>
+						<atoShapeXDiff value="0"/>
+						<atoShapeYDiff value="0"/>
+						<afromConnectType value="0"/>
+						<atoConnectType value="0"/>
+						<auseFromShapeCenter value="true"/>
+						<auseToShapeCenter value="true"/>
+						<afromPinType value="1"/>
+						<atoPinType value="1"/>
+						<arequestRebuild value="false"/>
+						<ashowConnectorName value="2"/>
+						<apaintThroughLabel value="2"/>
+					</properties>
+				</xmi:Extension>
+				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
+				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
+			</uml:DiagramElement>
+			<uml:DiagramElement geometry="285,367;635,367;" preferredShapeType="Association" subject="tG7RzuyCiu1SNwzq" xmi:id="9G7RzuyCiu1SNwzv">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<captionBounds value="434,370,44,14"/>
+					<captionInternalWidth value="-2147483648"/>
+					<captionInternalHeight value="-2147483648"/>
+					<captionVisible value="true"/>
+					<captionSide value="1"/>
+					<properties>
+						<abackground value="Cr:122,207,245,255"/>
+						<aforeground value="Cr:0,0,0,255"/>
+						<azOrder value="-1"/>
+						<acreatorDiagramType value="ClassDiagram"/>
+						<aselectable value="true"/>
+						<arequestResetCaption value="false"/>
+						<arequestResetCaptionSize value="false"/>
+						<aconnectorStyle value="3"/>
+						<aconnectorLineJumps value="4"/>
+						<aconnectorLabelOrientation value="4"/>
+						<afromShapeXDiff value="0"/>
+						<afromShapeYDiff value="0"/>
+						<atoShapeXDiff value="0"/>
+						<atoShapeYDiff value="0"/>
+						<afromConnectType value="0"/>
+						<atoConnectType value="0"/>
+						<auseFromShapeCenter value="true"/>
+						<auseToShapeCenter value="true"/>
+						<afromPinType value="1"/>
+						<atoPinType value="1"/>
+						<arequestRebuild value="false"/>
+						<ashowConnectorName value="2"/>
+						<apaintThroughLabel value="2"/>
+						<ahasRoleAShape value="false"/>
+						<ahasRoleBShape value="false"/>
+						<ashowMultiplicityConstraints value="false"/>
+						<ahasMultiplicityAShape value="false"/>
+						<ahasMultiplicityBShape value="false"/>
+						<a0SwDr value="false"/>
+						<ashowStereotypes value="true"/>
+						<ashowFromRoleName value="true"/>
+						<ashowToRoleName value="true"/>
+						<ashowFromMultiplicity value="true"/>
+						<ashowToMultiplicity value="true"/>
+						<ashowFromRoleVisibility value="true"/>
+						<ashowToRoleVisibility value="true"/>
+						<ashowAssociationEndPropertyStrings value="false"/>
+						<ahasAssociationEndPropertyStringsAShape value="false"/>
+						<ahasAssociationEndPropertyStringsBShape value="false"/>
+						<afromRoleInternalWidth value="-2147483648"/>
+						<afromRoleInternalHeight value="-2147483648"/>
+						<atoRoleInternalWidth value="-2147483648"/>
+						<atoRoleInternalHeight value="-2147483648"/>
+						<afromMultiplicityInternalWidth value="-2147483648"/>
+						<afromMultiplicityInternalHeight value="-2147483648"/>
+						<atoMultiplicityInternalWidth value="-2147483648"/>
+						<atoMultiplicityInternalHeight value="-2147483648"/>
+						<aassociationEndPropertyStringsAInternalWidth value="-2147483648"/>
+						<aassociationEndPropertyStringsAInternalHeight value="-2147483648"/>
+						<aassociationEndPropertyStringsBInternalWidth value="-2147483648"/>
+						<aassociationEndPropertyStringsBInternalHeight value="-2147483648"/>
+					</properties>
+				</xmi:Extension>
+				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
+				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
+			</uml:DiagramElement>
+			<uml:DiagramElement geometry="412,270,120,50" preferredShapeType="Class" subject="qmwxzuyCiu1SNwz5" xmi:id="qmwxzuyCiu1SNwz4">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<captionBounds value="0,0,120,14"/>
+					<captionInternalWidth value="-2147483648"/>
+					<captionInternalHeight value="-2147483648"/>
+					<captionVisible value="true"/>
+					<captionSide value="12"/>
+					<properties>
+						<abackground value="Cr:192,192,192,255"/>
+						<aforeground value="Cr:0,0,0,255"/>
+						<azOrder value="10"/>
+						<acreatorDiagramType value="ClassDiagram"/>
+						<aselectable value="true"/>
+						<arequestResetCaption value="false"/>
+						<arequestResetCaptionSize value="false"/>
+						<adisplayStereotypeIcon value="false"/>
+						<aoverrideAppearanceWithStereotypeIcon value="true"/>
+						<arequestSetSizeOption value="0"/>
+						<aparentConnectorHeaderLength value="40"/>
+						<aparentConnectorLineLength value="10"/>
+						<aconnectToPoint value="true"/>
+						<aparentConnectorDTheta value="0.0"/>
+						<aconnectionPointType value="2"/>
+						<amodelElementNameAlignment value="9"/>
+						<arequestDefaultSize value="false"/>
+						<arequestFitSize value="false"/>
+						<arequestFitSizeFromCenter value="false"/>
+						<adisplayAsRobustnessAnalysisIcon value="true"/>
+						<avisibilityStyle value="1"/>
+						<ashowAttributeType value="1"/>
+						<ashowOperationType value="1"/>
+						<amSwTpPts value="true"/>
+						<alshRfAts value="true"/>
+						<amShDrAt value="false"/>
+						<akShDrOp value="false"/>
+						<akSwCsMbSt value="true"/>
+						<ashowClassMemberConstraints value="true"/>
+						<alShCmMl value="false"/>
+						<ashowOperationParameterDirection value="false"/>
+						<ashowOperationRaisedExceptions value="false"/>
+						<ashowParameterNameInOperationSignature value="true"/>
+						<ashowOperationTemplateParameters value="false"/>
+						<ashowOperationProperties value="false"/>
+						<awpMbs value="false"/>
+						<aattributeSortType value="0"/>
+						<aoperationSortType value="0"/>
+						<ashowInitialAttributeValue value="true"/>
+						<ashowOperationSignature value="true"/>
+						<ainterfaceBall value="false"/>
+						<ashowEmptyCompartments value="0"/>
+						<ashowEllipsisForUnshownMembers value="0"/>
+						<ashowAttributesCodeDetails value="0"/>
+						<ashowOperationsCodeDetails value="0"/>
+						<ashowParametersCodeDetails value="0"/>
+						<ashowTypeOption value="0"/>
+						<ashowOwnerOption value="3"/>
+						<ashowAttributesType value="0"/>
+						<ashowOperationsParameters value="0"/>
+						<ashowOperationsReturnType value="0"/>
+					</properties>
+				</xmi:Extension>
+				<elementFill color1="Cr:192,192,192,255" color2="" style="1" transparency="0" type="1"/>
+				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
+				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
+			</uml:DiagramElement>
+			<uml:DiagramElement geometry="451,230;451,269;" preferredShapeType="AssociationClass" subject="1DMxzuyCiu1SNw0F" xmi:id="1DMxzuyCiu1SNw0G">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<captionBounds value="461,269,20,0"/>
+					<captionInternalWidth value="-2147483648"/>
+					<captionInternalHeight value="-2147483648"/>
+					<captionVisible value="true"/>
+					<captionSide value="1"/>
+					<properties>
+						<abackground value="Cr:122,207,245,255"/>
+						<aforeground value="Cr:0,0,0,255"/>
+						<azOrder value="-1"/>
+						<aselectable value="true"/>
+						<arequestResetCaption value="false"/>
+						<arequestResetCaptionSize value="false"/>
+						<aconnectorStyle value="3"/>
+						<aconnectorLineJumps value="4"/>
+						<aconnectorLabelOrientation value="4"/>
+						<afromShapeXDiff value="0"/>
+						<afromShapeYDiff value="0"/>
+						<atoShapeXDiff value="0"/>
+						<atoShapeYDiff value="0"/>
+						<afromConnectType value="0"/>
+						<atoConnectType value="0"/>
+						<auseFromShapeCenter value="true"/>
+						<auseToShapeCenter value="true"/>
+						<afromPinType value="1"/>
+						<atoPinType value="1"/>
+						<arequestRebuild value="false"/>
+						<ashowConnectorName value="2"/>
+						<apaintThroughLabel value="2"/>
+					</properties>
+				</xmi:Extension>
+				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
+				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
+			</uml:DiagramElement>
+			<uml:DiagramElement geometry="411,278;179,278;179,220;" preferredShapeType="Association" subject="iyCxzuyCiu1SNw0N" xmi:id="iyCxzuyCiu1SNw0S">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<captionBounds value="207,279,58,14"/>
+					<captionInternalWidth value="-2147483648"/>
+					<captionInternalHeight value="-2147483648"/>
+					<captionVisible value="true"/>
+					<captionSide value="1"/>
+					<properties>
+						<abackground value="Cr:122,207,245,255"/>
+						<aforeground value="Cr:0,0,0,255"/>
+						<azOrder value="-1"/>
+						<acreatorDiagramType value="ClassDiagram"/>
+						<aselectable value="true"/>
+						<arequestResetCaption value="false"/>
+						<arequestResetCaptionSize value="false"/>
+						<aconnectorStyle value="3"/>
+						<aconnectorLineJumps value="4"/>
+						<aconnectorLabelOrientation value="4"/>
+						<afromShapeXDiff value="0"/>
+						<afromShapeYDiff value="0"/>
+						<atoShapeXDiff value="0"/>
+						<atoShapeYDiff value="0"/>
+						<afromConnectType value="0"/>
+						<atoConnectType value="0"/>
+						<auseFromShapeCenter value="true"/>
+						<auseToShapeCenter value="true"/>
+						<afromPinType value="1"/>
+						<atoPinType value="1"/>
+						<arequestRebuild value="false"/>
+						<ashowConnectorName value="2"/>
+						<apaintThroughLabel value="2"/>
+						<ahasRoleAShape value="false"/>
+						<ahasRoleBShape value="false"/>
+						<ashowMultiplicityConstraints value="false"/>
+						<ahasMultiplicityAShape value="false"/>
+						<ahasMultiplicityBShape value="false"/>
+						<a0SwDr value="false"/>
+						<ashowStereotypes value="true"/>
+						<ashowFromRoleName value="true"/>
+						<ashowToRoleName value="true"/>
+						<ashowFromMultiplicity value="true"/>
+						<ashowToMultiplicity value="true"/>
+						<ashowFromRoleVisibility value="true"/>
+						<ashowToRoleVisibility value="true"/>
+						<ashowAssociationEndPropertyStrings value="false"/>
+						<ahasAssociationEndPropertyStringsAShape value="false"/>
+						<ahasAssociationEndPropertyStringsBShape value="false"/>
+						<afromRoleInternalWidth value="-2147483648"/>
+						<afromRoleInternalHeight value="-2147483648"/>
+						<atoRoleInternalWidth value="-2147483648"/>
+						<atoRoleInternalHeight value="-2147483648"/>
+						<afromMultiplicityInternalWidth value="-2147483648"/>
+						<afromMultiplicityInternalHeight value="-2147483648"/>
+						<atoMultiplicityInternalWidth value="-2147483648"/>
+						<atoMultiplicityInternalHeight value="-2147483648"/>
+						<aassociationEndPropertyStringsAInternalWidth value="-2147483648"/>
+						<aassociationEndPropertyStringsAInternalHeight value="-2147483648"/>
+						<aassociationEndPropertyStringsBInternalWidth value="-2147483648"/>
+						<aassociationEndPropertyStringsBInternalHeight value="-2147483648"/>
+					</properties>
+				</xmi:Extension>
+				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
+				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
+			</uml:DiagramElement>
+			<uml:DiagramElement geometry="552,270,120,50" preferredShapeType="Class" subject="C9LxzuyCiu1SNw0z" xmi:id="89LxzuyCiu1SNw0y">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<captionBounds value="0,0,120,14"/>
+					<captionInternalWidth value="-2147483648"/>
+					<captionInternalHeight value="-2147483648"/>
+					<captionVisible value="true"/>
+					<captionSide value="12"/>
+					<properties>
+						<abackground value="Cr:192,192,192,255"/>
+						<aforeground value="Cr:0,0,0,255"/>
+						<azOrder value="8"/>
+						<acreatorDiagramType value="ClassDiagram"/>
+						<aselectable value="true"/>
+						<arequestResetCaption value="false"/>
+						<arequestResetCaptionSize value="false"/>
+						<adisplayStereotypeIcon value="false"/>
+						<aoverrideAppearanceWithStereotypeIcon value="true"/>
+						<arequestSetSizeOption value="0"/>
+						<aparentConnectorHeaderLength value="40"/>
+						<aparentConnectorLineLength value="10"/>
+						<aconnectToPoint value="true"/>
+						<aparentConnectorDTheta value="0.0"/>
+						<aconnectionPointType value="2"/>
+						<amodelElementNameAlignment value="9"/>
+						<arequestDefaultSize value="false"/>
+						<arequestFitSize value="false"/>
+						<arequestFitSizeFromCenter value="false"/>
+						<adisplayAsRobustnessAnalysisIcon value="true"/>
+						<avisibilityStyle value="1"/>
+						<ashowAttributeType value="1"/>
+						<ashowOperationType value="1"/>
+						<amSwTpPts value="true"/>
+						<alshRfAts value="true"/>
+						<amShDrAt value="false"/>
+						<akShDrOp value="false"/>
+						<akSwCsMbSt value="true"/>
+						<ashowClassMemberConstraints value="true"/>
+						<alShCmMl value="false"/>
+						<ashowOperationParameterDirection value="false"/>
+						<ashowOperationRaisedExceptions value="false"/>
+						<ashowParameterNameInOperationSignature value="true"/>
+						<ashowOperationTemplateParameters value="false"/>
+						<ashowOperationProperties value="false"/>
+						<awpMbs value="false"/>
+						<aattributeSortType value="0"/>
+						<aoperationSortType value="0"/>
+						<ashowInitialAttributeValue value="true"/>
+						<ashowOperationSignature value="true"/>
+						<ainterfaceBall value="false"/>
+						<ashowEmptyCompartments value="0"/>
+						<ashowEllipsisForUnshownMembers value="0"/>
+						<ashowAttributesCodeDetails value="0"/>
+						<ashowOperationsCodeDetails value="0"/>
+						<ashowParametersCodeDetails value="0"/>
+						<ashowTypeOption value="0"/>
+						<ashowOwnerOption value="3"/>
+						<ashowAttributesType value="0"/>
+						<ashowOperationsParameters value="0"/>
+						<ashowOperationsReturnType value="0"/>
+					</properties>
+				</xmi:Extension>
+				<elementFill color1="Cr:192,192,192,255" color2="" style="1" transparency="0" type="1"/>
+				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
+				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
+			</uml:DiagramElement>
+			<uml:DiagramElement geometry="593,160;593,269;" preferredShapeType="AssociationClass" subject="FMPxzuyCiu1SNw08" xmi:id="FMPxzuyCiu1SNw09">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<captionBounds value="603,234,20,0"/>
+					<captionInternalWidth value="-2147483648"/>
+					<captionInternalHeight value="-2147483648"/>
+					<captionVisible value="true"/>
+					<captionSide value="1"/>
+					<properties>
+						<abackground value="Cr:122,207,245,255"/>
+						<aforeground value="Cr:0,0,0,255"/>
+						<azOrder value="-1"/>
+						<aselectable value="true"/>
+						<arequestResetCaption value="false"/>
+						<arequestResetCaptionSize value="false"/>
+						<aconnectorStyle value="3"/>
+						<aconnectorLineJumps value="4"/>
+						<aconnectorLabelOrientation value="4"/>
+						<afromShapeXDiff value="0"/>
+						<afromShapeYDiff value="0"/>
+						<atoShapeXDiff value="0"/>
+						<atoShapeYDiff value="0"/>
+						<afromConnectType value="0"/>
+						<atoConnectType value="0"/>
+						<auseFromShapeCenter value="true"/>
+						<auseToShapeCenter value="true"/>
+						<afromPinType value="1"/>
+						<atoPinType value="1"/>
+						<arequestRebuild value="false"/>
+						<ashowConnectorName value="2"/>
+						<apaintThroughLabel value="2"/>
+					</properties>
+				</xmi:Extension>
+				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
+				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
+			</uml:DiagramElement>
+			<uml:DiagramElement geometry="92,96,676,164" preferredShapeType="SECurveShape" subject="XHTOHuyCiu1SNxIe" xmi:id="XHTOHuyCiu1SNxId">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<captionBounds value="0,0,40,40"/>
+					<captionInternalWidth value="-2147483648"/>
+					<captionInternalHeight value="-2147483648"/>
+					<captionVisible value="false"/>
+					<captionSide value="7"/>
+					<properties>
+						<abackground value="Cr:255,255,192,127"/>
+						<aforeground value="Cr:192,192,192,255"/>
+						<azOrder value="22"/>
+						<aselectable value="true"/>
+						<arequestResetCaption value="false"/>
+						<arequestResetCaptionSize value="false"/>
+						<adisplayStereotypeIcon value="false"/>
+						<aoverrideAppearanceWithStereotypeIcon value="true"/>
+						<arequestSetSizeOption value="0"/>
+						<aparentConnectorHeaderLength value="40"/>
+						<aparentConnectorLineLength value="10"/>
+						<aconnectToPoint value="true"/>
+						<aparentConnectorDTheta value="0.0"/>
+						<aconnectionPointType value="2"/>
+						<amodelElementNameAlignment value="9"/>
+						<arequestDefaultSize value="false"/>
+						<arequestFitSize value="false"/>
+						<arequestFitSizeFromCenter value="false"/>
+						<aobjectId value="1"/>
+						<aobjectType value="9096"/>
+						<anotUseVisibleBounds value="false"/>
+						<aalpha value="1.0"/>
+						<arotateAngle value="0.0"/>
+						<anodeName value="VPCurveShape"/>
+						<aactConnector value="true"/>
+						<adrawBy value="3"/>
+					</properties>
+					<FontFormat fontColor="Cr:0,0,0,255">
+						<Font name="Dialog" size="11" style="0"/>
+					</FontFormat>
+					<Label location="Pt:429.99999999999994,178.0" text=""/>
+					<Label transparency="0" tx="0.0" ty="0.0" type="0">
+						<FillFormat renderStyle="1">
+							<AffineTransformMatrix>
+								<Matrix value="1.0"/>
+								<Matrix value="0.0"/>
+								<Matrix value="0.0"/>
+								<Matrix value="1.0"/>
+								<Matrix value="0.0"/>
+								<Matrix value="0.0"/>
+							</AffineTransformMatrix>
+							<Render color="Cr:0,0,0,255"/>
+						</FillFormat>
+					</Label>
+					<ShapeBasePoint point="Pt:429.99999999999994,178.0"/>
+					<Arrow endArrow="0" startArrow="0"/>
+					<LineFormat color="Cr:192,192,192,255" style="91" width="1.0">
+						<Stroke cap="0" dashPhase="0.0" join="0" miterlimit="10.0" type="0" width="1.0"/>
+					</LineFormat>
+					<FillFormat renderStyle="1">
+						<AffineTransformMatrix>
+							<Matrix value="1.0"/>
+							<Matrix value="0.0"/>
+							<Matrix value="0.0"/>
+							<Matrix value="1.0"/>
+							<Matrix value="0.0"/>
+							<Matrix value="0.0"/>
+						</AffineTransformMatrix>
+						<Render color="Cr:255,255,192,127"/>
+					</FillFormat>
+					<CurveList windingRule="1">
+						<Curves>
+							<Curve controlPoint1="Pt:268.0,110.0" controlPoint2="Pt:592.0,110.0" endPoint="Pt:754.0,110.0" objectId="1" startPoint="Pt:106.0,110.0"/>
+							<Curve controlPoint1="Pt:754.0,144.0" controlPoint2="Pt:754.0,212.0" endPoint="Pt:754.0,246.0" objectId="2" startPoint="Pt:754.0,110.0"/>
+							<Curve controlPoint1="Pt:592.0,246.0" controlPoint2="Pt:268.0,246.0" endPoint="Pt:106.0,246.0" objectId="3" startPoint="Pt:754.0,246.0"/>
+							<Curve controlPoint1="Pt:106.0,212.0" controlPoint2="Pt:106.0,144.0" endPoint="Pt:106.0,110.0" objectId="4" startPoint="Pt:106.0,246.0"/>
+						</Curves>
+					</CurveList>
+				</xmi:Extension>
+				<elementFill color1="Cr:255,255,192,127" color2="" style="1" transparency="50" type="1"/>
+				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
+				<elementLine color="Cr:192,192,192,255" style="1" transparency="0" weight="1.0"/>
+			</uml:DiagramElement>
+			<uml:DiagramElement geometry="7,284,141,65" preferredShapeType="NOTE" subject="afB2HuyCiu1SNxHe" xmi:id="S5YuHuyCiu1SNxI3">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<captionBounds value="0,0,141,0"/>
+					<captionInternalWidth value="-2147483648"/>
+					<captionInternalHeight value="-2147483648"/>
+					<captionVisible value="true"/>
+					<captionSide value="12"/>
+					<properties>
+						<abackground value="Cr:255,255,192,127"/>
+						<aforeground value="Cr:0,0,0,255"/>
+						<azOrder value="6"/>
+						<aselectable value="true"/>
+						<arequestResetCaption value="false"/>
+						<arequestResetCaptionSize value="false"/>
+						<adisplayStereotypeIcon value="false"/>
+						<aoverrideAppearanceWithStereotypeIcon value="true"/>
+						<arequestSetSizeOption value="0"/>
+						<aparentConnectorHeaderLength value="40"/>
+						<aparentConnectorLineLength value="10"/>
+						<aconnectToPoint value="true"/>
+						<aparentConnectorDTheta value="0.0"/>
+						<aconnectionPointType value="2"/>
+						<amodelElementNameAlignment value="9"/>
+						<arequestDefaultSize value="false"/>
+						<arequestFitSize value="false"/>
+						<arequestFitSizeFromCenter value="false"/>
+						<aangle value="0"/>
+					</properties>
+				</xmi:Extension>
+				<elementFill color1="Cr:255,255,192,127" color2="" style="1" transparency="50" type="1"/>
+				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
+				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
+			</uml:DiagramElement>
+			<uml:DiagramElement geometry="114,283;114,260;" preferredShapeType="Anchor" subject="lK0uHuyCiu1SNxI7" xmi:id="lK0uHuyCiu1SNxI8">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<captionBounds value="114,272,20,0"/>
+					<captionInternalWidth value="-2147483648"/>
+					<captionInternalHeight value="-2147483648"/>
+					<captionVisible value="true"/>
+					<captionSide value="1"/>
+					<properties>
+						<abackground value="Cr:122,207,245,255"/>
+						<aforeground value="Cr:0,0,0,255"/>
+						<azOrder value="-1"/>
+						<acreatorDiagramType value="ClassDiagram"/>
+						<aselectable value="true"/>
+						<arequestResetCaption value="false"/>
+						<arequestResetCaptionSize value="false"/>
+						<aconnectorStyle value="3"/>
+						<aconnectorLineJumps value="4"/>
+						<aconnectorLabelOrientation value="4"/>
+						<afromShapeXDiff value="0"/>
+						<afromShapeYDiff value="0"/>
+						<atoShapeXDiff value="0"/>
+						<atoShapeYDiff value="0"/>
+						<afromConnectType value="0"/>
+						<atoConnectType value="0"/>
+						<auseFromShapeCenter value="true"/>
+						<auseToShapeCenter value="true"/>
+						<afromPinType value="1"/>
+						<atoPinType value="1"/>
+						<arequestRebuild value="false"/>
+						<ashowConnectorName value="2"/>
+						<apaintThroughLabel value="2"/>
+					</properties>
+				</xmi:Extension>
+				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
+				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
+			</uml:DiagramElement>
+			<uml:DiagramElement geometry="267,435,105,40" preferredShapeType="Class" subject="4V6W3uyCiu1SNxTH" xmi:id="Fl6W3uyCiu1SNxTG">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<captionBounds value="0,0,105,28"/>
+					<captionInternalWidth value="-2147483648"/>
+					<captionInternalHeight value="-2147483648"/>
+					<captionVisible value="true"/>
+					<captionSide value="12"/>
+					<properties>
+						<abackground value="Cr:179,214,249,255"/>
+						<aforeground value="Cr:0,0,0,255"/>
+						<azOrder value="4"/>
+						<acreatorDiagramType value="ClassDiagram"/>
+						<aselectable value="true"/>
+						<arequestResetCaption value="false"/>
+						<arequestResetCaptionSize value="false"/>
+						<adisplayStereotypeIcon value="false"/>
+						<aoverrideAppearanceWithStereotypeIcon value="true"/>
+						<arequestSetSizeOption value="0"/>
+						<aparentConnectorHeaderLength value="40"/>
+						<aparentConnectorLineLength value="10"/>
+						<aconnectToPoint value="true"/>
+						<aparentConnectorDTheta value="0.0"/>
+						<aconnectionPointType value="2"/>
+						<amodelElementNameAlignment value="9"/>
+						<arequestDefaultSize value="false"/>
+						<arequestFitSize value="false"/>
+						<arequestFitSizeFromCenter value="false"/>
+						<adisplayAsRobustnessAnalysisIcon value="true"/>
+						<avisibilityStyle value="1"/>
+						<ashowAttributeType value="1"/>
+						<ashowOperationType value="1"/>
+						<amSwTpPts value="true"/>
+						<alshRfAts value="true"/>
+						<amShDrAt value="false"/>
+						<akShDrOp value="false"/>
+						<akSwCsMbSt value="true"/>
+						<ashowClassMemberConstraints value="true"/>
+						<alShCmMl value="false"/>
+						<ashowOperationParameterDirection value="false"/>
+						<ashowOperationRaisedExceptions value="false"/>
+						<ashowParameterNameInOperationSignature value="true"/>
+						<ashowOperationTemplateParameters value="false"/>
+						<ashowOperationProperties value="false"/>
+						<awpMbs value="false"/>
+						<aattributeSortType value="0"/>
+						<aoperationSortType value="0"/>
+						<ashowInitialAttributeValue value="true"/>
+						<ashowOperationSignature value="true"/>
+						<ainterfaceBall value="false"/>
+						<ashowEmptyCompartments value="0"/>
+						<ashowEllipsisForUnshownMembers value="0"/>
+						<ashowAttributesCodeDetails value="0"/>
+						<ashowOperationsCodeDetails value="0"/>
+						<ashowParametersCodeDetails value="0"/>
+						<ashowTypeOption value="0"/>
+						<ashowOwnerOption value="3"/>
+						<ashowAttributesType value="0"/>
+						<ashowOperationsParameters value="0"/>
+						<ashowOperationsReturnType value="0"/>
+					</properties>
+				</xmi:Extension>
+				<elementFill color1="Cr:179,214,249,255" color2="" style="1" transparency="0" type="1"/>
+				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
+				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
+			</uml:DiagramElement>
+			<uml:DiagramElement geometry="395,436,105,40" preferredShapeType="Class" subject="RB2W3uyCiu1SNxTP" xmi:id="hB2W3uyCiu1SNxTO">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<captionBounds value="0,0,105,28"/>
+					<captionInternalWidth value="-2147483648"/>
+					<captionInternalHeight value="-2147483648"/>
+					<captionVisible value="true"/>
+					<captionSide value="12"/>
+					<properties>
+						<abackground value="Cr:179,214,249,255"/>
+						<aforeground value="Cr:0,0,0,255"/>
+						<azOrder value="2"/>
+						<acreatorDiagramType value="ClassDiagram"/>
+						<aselectable value="true"/>
+						<arequestResetCaption value="false"/>
+						<arequestResetCaptionSize value="false"/>
+						<adisplayStereotypeIcon value="false"/>
+						<aoverrideAppearanceWithStereotypeIcon value="true"/>
+						<arequestSetSizeOption value="0"/>
+						<aparentConnectorHeaderLength value="40"/>
+						<aparentConnectorLineLength value="10"/>
+						<aconnectToPoint value="true"/>
+						<aparentConnectorDTheta value="0.0"/>
+						<aconnectionPointType value="2"/>
+						<amodelElementNameAlignment value="9"/>
+						<arequestDefaultSize value="false"/>
+						<arequestFitSize value="false"/>
+						<arequestFitSizeFromCenter value="false"/>
+						<adisplayAsRobustnessAnalysisIcon value="true"/>
+						<avisibilityStyle value="1"/>
+						<ashowAttributeType value="1"/>
+						<ashowOperationType value="1"/>
+						<amSwTpPts value="true"/>
+						<alshRfAts value="true"/>
+						<amShDrAt value="false"/>
+						<akShDrOp value="false"/>
+						<akSwCsMbSt value="true"/>
+						<ashowClassMemberConstraints value="true"/>
+						<alShCmMl value="false"/>
+						<ashowOperationParameterDirection value="false"/>
+						<ashowOperationRaisedExceptions value="false"/>
+						<ashowParameterNameInOperationSignature value="true"/>
+						<ashowOperationTemplateParameters value="false"/>
+						<ashowOperationProperties value="false"/>
+						<awpMbs value="false"/>
+						<aattributeSortType value="0"/>
+						<aoperationSortType value="0"/>
+						<ashowInitialAttributeValue value="true"/>
+						<ashowOperationSignature value="true"/>
+						<ainterfaceBall value="false"/>
+						<ashowEmptyCompartments value="0"/>
+						<ashowEllipsisForUnshownMembers value="0"/>
+						<ashowAttributesCodeDetails value="0"/>
+						<ashowOperationsCodeDetails value="0"/>
+						<ashowParametersCodeDetails value="0"/>
+						<ashowTypeOption value="0"/>
+						<ashowOwnerOption value="3"/>
+						<ashowAttributesType value="0"/>
+						<ashowOperationsParameters value="0"/>
+						<ashowOperationsReturnType value="0"/>
+					</properties>
+				</xmi:Extension>
+				<elementFill color1="Cr:179,214,249,255" color2="" style="1" transparency="0" type="1"/>
+				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
+				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
+			</uml:DiagramElement>
+			<uml:DiagramElement geometry="149,435,105,40" preferredShapeType="Class" subject="zuuW3uyCiu1SNxTU" xmi:id="zuuW3uyCiu1SNxTT">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<captionBounds value="0,0,105,28"/>
+					<captionInternalWidth value="-2147483648"/>
+					<captionInternalHeight value="-2147483648"/>
+					<captionVisible value="true"/>
+					<captionSide value="12"/>
+					<properties>
+						<abackground value="Cr:179,214,249,255"/>
+						<aforeground value="Cr:0,0,0,255"/>
+						<azOrder value="0"/>
+						<acreatorDiagramType value="ClassDiagram"/>
+						<aselectable value="true"/>
+						<arequestResetCaption value="false"/>
+						<arequestResetCaptionSize value="false"/>
+						<adisplayStereotypeIcon value="false"/>
+						<aoverrideAppearanceWithStereotypeIcon value="true"/>
+						<arequestSetSizeOption value="0"/>
+						<aparentConnectorHeaderLength value="40"/>
+						<aparentConnectorLineLength value="10"/>
+						<aconnectToPoint value="true"/>
+						<aparentConnectorDTheta value="0.0"/>
+						<aconnectionPointType value="2"/>
+						<amodelElementNameAlignment value="9"/>
+						<arequestDefaultSize value="false"/>
+						<arequestFitSize value="false"/>
+						<arequestFitSizeFromCenter value="false"/>
+						<adisplayAsRobustnessAnalysisIcon value="true"/>
+						<avisibilityStyle value="1"/>
+						<ashowAttributeType value="1"/>
+						<ashowOperationType value="1"/>
+						<amSwTpPts value="true"/>
+						<alshRfAts value="true"/>
+						<amShDrAt value="false"/>
+						<akShDrOp value="false"/>
+						<akSwCsMbSt value="true"/>
+						<ashowClassMemberConstraints value="true"/>
+						<alShCmMl value="false"/>
+						<ashowOperationParameterDirection value="false"/>
+						<ashowOperationRaisedExceptions value="false"/>
+						<ashowParameterNameInOperationSignature value="true"/>
+						<ashowOperationTemplateParameters value="false"/>
+						<ashowOperationProperties value="false"/>
+						<awpMbs value="false"/>
+						<aattributeSortType value="0"/>
+						<aoperationSortType value="0"/>
+						<ashowInitialAttributeValue value="true"/>
+						<ashowOperationSignature value="true"/>
+						<ainterfaceBall value="false"/>
+						<ashowEmptyCompartments value="0"/>
+						<ashowEllipsisForUnshownMembers value="0"/>
+						<ashowAttributesCodeDetails value="0"/>
+						<ashowOperationsCodeDetails value="0"/>
+						<ashowParametersCodeDetails value="0"/>
+						<ashowTypeOption value="0"/>
+						<ashowOwnerOption value="3"/>
+						<ashowAttributesType value="0"/>
+						<ashowOperationsParameters value="0"/>
+						<ashowOperationsReturnType value="0"/>
+					</properties>
+				</xmi:Extension>
+				<elementFill color1="Cr:179,214,249,255" color2="" style="1" transparency="0" type="1"/>
+				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
+				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
+			</uml:DiagramElement>
+			<uml:DiagramElement geometry="407,190;407,435;" preferredShapeType="Generalization" subject="BHNW3uyCiu1SNxT2" xmi:id="BHNW3uyCiu1SNxT3">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<captionBounds value="407,312,20,0"/>
+					<captionInternalWidth value="-2147483648"/>
+					<captionInternalHeight value="-2147483648"/>
+					<captionVisible value="true"/>
+					<captionSide value="1"/>
+					<properties>
+						<abackground value="Cr:255,255,255,255"/>
+						<aforeground value="Cr:0,0,0,255"/>
+						<azOrder value="-1"/>
+						<acreatorDiagramType value="ClassDiagram"/>
+						<aselectable value="true"/>
+						<arequestResetCaption value="false"/>
+						<arequestResetCaptionSize value="false"/>
+						<aconnectorStyle value="3"/>
+						<aconnectorLineJumps value="4"/>
+						<aconnectorLabelOrientation value="4"/>
+						<afromShapeXDiff value="0"/>
+						<afromShapeYDiff value="0"/>
+						<atoShapeXDiff value="0"/>
+						<atoShapeYDiff value="0"/>
+						<afromConnectType value="0"/>
+						<atoConnectType value="0"/>
+						<auseFromShapeCenter value="true"/>
+						<auseToShapeCenter value="true"/>
+						<afromPinType value="1"/>
+						<atoPinType value="1"/>
+						<arequestRebuild value="false"/>
+						<ashowConnectorName value="2"/>
+						<apaintThroughLabel value="2"/>
+					</properties>
+				</xmi:Extension>
+				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
+				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
+			</uml:DiagramElement>
+			<uml:DiagramElement geometry="382,190;382,197;371,435;" preferredShapeType="Generalization" subject="tJTW3uyCiu1SNxT." xmi:id="tJTW3uyCiu1SNxT_">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<captionBounds value="376,311,20,0"/>
+					<captionInternalWidth value="-2147483648"/>
+					<captionInternalHeight value="-2147483648"/>
+					<captionVisible value="true"/>
+					<captionSide value="1"/>
+					<properties>
+						<abackground value="Cr:255,255,255,255"/>
+						<aforeground value="Cr:0,0,0,255"/>
+						<azOrder value="-1"/>
+						<acreatorDiagramType value="ClassDiagram"/>
+						<aselectable value="true"/>
+						<arequestResetCaption value="false"/>
+						<arequestResetCaptionSize value="false"/>
+						<aconnectorStyle value="3"/>
+						<aconnectorLineJumps value="4"/>
+						<aconnectorLabelOrientation value="4"/>
+						<afromShapeXDiff value="0"/>
+						<afromShapeYDiff value="0"/>
+						<atoShapeXDiff value="0"/>
+						<atoShapeYDiff value="0"/>
+						<afromConnectType value="0"/>
+						<atoConnectType value="0"/>
+						<auseFromShapeCenter value="true"/>
+						<auseToShapeCenter value="true"/>
+						<afromPinType value="1"/>
+						<atoPinType value="1"/>
+						<arequestRebuild value="false"/>
+						<ashowConnectorName value="2"/>
+						<apaintThroughLabel value="2"/>
+					</properties>
+				</xmi:Extension>
+				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
+				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
+			</uml:DiagramElement>
+			<uml:DiagramElement geometry="371,190;296,400;254,435;" preferredShapeType="Generalization" subject="oCw23uyCiu1SNxUT" xmi:id="oCw23uyCiu1SNxUU">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<captionBounds value="323,324,20,0"/>
+					<captionInternalWidth value="-2147483648"/>
+					<captionInternalHeight value="-2147483648"/>
+					<captionVisible value="true"/>
+					<captionSide value="1"/>
+					<properties>
+						<abackground value="Cr:255,255,255,255"/>
+						<aforeground value="Cr:0,0,0,255"/>
+						<azOrder value="-1"/>
+						<acreatorDiagramType value="ClassDiagram"/>
+						<aselectable value="true"/>
+						<arequestResetCaption value="false"/>
+						<arequestResetCaptionSize value="false"/>
+						<aconnectorStyle value="3"/>
+						<aconnectorLineJumps value="4"/>
+						<aconnectorLabelOrientation value="4"/>
+						<afromShapeXDiff value="0"/>
+						<afromShapeYDiff value="0"/>
+						<atoShapeXDiff value="0"/>
+						<atoShapeYDiff value="0"/>
+						<afromConnectType value="0"/>
+						<atoConnectType value="0"/>
+						<auseFromShapeCenter value="true"/>
+						<auseToShapeCenter value="true"/>
+						<afromPinType value="1"/>
+						<atoPinType value="1"/>
+						<arequestRebuild value="false"/>
+						<ashowConnectorName value="2"/>
+						<apaintThroughLabel value="2"/>
+					</properties>
+				</xmi:Extension>
+				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
+				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
+			</uml:DiagramElement>
 		</uml:Diagram.element>
 	</uml:Diagram>
+	<uml:Diagram diagramType="ClassDiagram" documentation="" name="Component4" toolName="Visual Paradigm for UML" xmi:id="LWwpzuyCiu1SNw1u">
+		<xmi:Extension extender="Visual Paradigm for UML">
+			<properties>
+				<apmAuthor value="lavm"/>
+				<apmCreateDateTime value="1337673922228"/>
+				<apmLastModified value="1337806320596"/>
+				<ashowPackageNameStyle value="0"/>
+				<ashowConnectorName value="0"/>
+				<apaintConnectorThroughLabel value="0"/>
+				<ashowActivityStateNodeCaption value="65535"/>
+				<aeditable value="true"/>
+				<afollowDiagramParentElement value="true"/>
+				<aautoFitShapesSize value="false"/>
+				<ashowTaggedValues value="false"/>
+				<ashowStereotypes value="true"/>
+				<ashowConstraints value="false"/>
+				<aalignToGrid value="true"/>
+				<agridVisible value="false"/>
+				<agridWidth value="10"/>
+				<agridHeight value="10"/>
+				<agridColor value="Cr:192,192,192,255"/>
+				<adiagramBackground value="Cr:255,255,255,255"/>
+				<aconnectorStyle value="1"/>
+				<aconnectorLineJumps value="0"/>
+				<aconnectorLineJumpsSize value="0"/>
+				<aconnectionPointStyle value="0"/>
+				<aconnectorLabelOrientation value="0"/>
+				<amodelElementNameAlignment value="4"/>
+				<azoomRatio value="1.0"/>
+				<amaximized value="false"/>
+				<ax value="0"/>
+				<ay value="0"/>
+				<awidth value="1235"/>
+				<aheight value="505"/>
+				<aqualityScore value="-1"/>
+				<aparentModel value="MdIpzuyCiu1SNw10"/>
+				<a_globalPaletteOption value="true"/>
+				<a_alwaysShowReferenceAndSubdiagramResource value="false"/>
+				<ainitializeDiagramForCreate value="true"/>
+				<arequestValidateSnapToGrid value="false"/>
+				<ashowDefaultPackage value="true"/>
+				<adefaultPackage value="MdIpzuyCiu1SNw10"/>
+				<ashowAttributeGetterSetter value="false"/>
+				<ashowClassOwner value="2"/>
+				<ashowPackageOwner value="2"/>
+				<ashowTemplateInfoOfGeneralizationAndRealization value="false"/>
+				<asuppressImplied1MultiplicityForAttributeAndAssociationEnd value="false"/>
+				<ashowClassEmptyCompartments value="2"/>
+				<ashowAttributesCodeDetails value="2"/>
+				<ashowAttributesType value="1"/>
+				<ashowOperationsParameters value="1"/>
+				<ashowOperationsReturnType value="1"/>
+				<ashowOperationsCodeDetails value="2"/>
+				<ashowParametersCodeDetails value="2"/>
+				<ashowEllipsisForUnshownClassMembers value="2"/>
+				<ageneralizationSetNotation value="2"/>
+			</properties>
+		</xmi:Extension>
+		<uml:Diagram.element>
+			<uml:DiagramElement geometry="340,160,80,50" preferredShapeType="Class" subject="m6xjmuyEwTiAAgLk" xmi:id="TPopzuyCiu1SNw12">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<captionBounds value="0,0,80,14"/>
+					<captionInternalWidth value="-2147483648"/>
+					<captionInternalHeight value="-2147483648"/>
+					<captionVisible value="true"/>
+					<captionSide value="12"/>
+					<properties>
+						<abackground value="Cr:122,207,245,255"/>
+						<aforeground value="Cr:0,0,0,255"/>
+						<azOrder value="0"/>
+						<aselectable value="true"/>
+						<arequestResetCaption value="false"/>
+						<arequestResetCaptionSize value="false"/>
+						<adisplayStereotypeIcon value="false"/>
+						<aoverrideAppearanceWithStereotypeIcon value="true"/>
+						<arequestSetSizeOption value="0"/>
+						<aparentConnectorHeaderLength value="40"/>
+						<aparentConnectorLineLength value="10"/>
+						<aconnectToPoint value="true"/>
+						<aparentConnectorDTheta value="0.0"/>
+						<aconnectionPointType value="2"/>
+						<amodelElementNameAlignment value="9"/>
+						<arequestDefaultSize value="false"/>
+						<arequestFitSize value="false"/>
+						<arequestFitSizeFromCenter value="false"/>
+						<adisplayAsRobustnessAnalysisIcon value="true"/>
+						<avisibilityStyle value="1"/>
+						<ashowAttributeType value="1"/>
+						<ashowOperationType value="1"/>
+						<amSwTpPts value="true"/>
+						<alshRfAts value="true"/>
+						<amShDrAt value="false"/>
+						<akShDrOp value="false"/>
+						<akSwCsMbSt value="true"/>
+						<ashowClassMemberConstraints value="true"/>
+						<alShCmMl value="false"/>
+						<ashowOperationParameterDirection value="false"/>
+						<ashowOperationRaisedExceptions value="false"/>
+						<ashowParameterNameInOperationSignature value="true"/>
+						<ashowOperationTemplateParameters value="false"/>
+						<ashowOperationProperties value="false"/>
+						<awpMbs value="false"/>
+						<aattributeSortType value="0"/>
+						<aoperationSortType value="0"/>
+						<ashowInitialAttributeValue value="true"/>
+						<ashowOperationSignature value="true"/>
+						<ainterfaceBall value="false"/>
+						<ashowEmptyCompartments value="0"/>
+						<ashowEllipsisForUnshownMembers value="0"/>
+						<ashowAttributesCodeDetails value="0"/>
+						<ashowOperationsCodeDetails value="0"/>
+						<ashowParametersCodeDetails value="0"/>
+						<ashowTypeOption value="0"/>
+						<ashowOwnerOption value="3"/>
+						<ashowAttributesType value="0"/>
+						<ashowOperationsParameters value="0"/>
+						<ashowOperationsReturnType value="0"/>
+					</properties>
+				</xmi:Extension>
+				<elementFill color1="Cr:122,207,245,255" color2="" style="1" transparency="0" type="1"/>
+				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
+				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
+			</uml:DiagramElement>
+			<uml:DiagramElement geometry="400,159;400,120;480,120;480,190;420,190;" preferredShapeType="Association" subject="AHUpzuyCiu1SNw2V" xmi:id="AHUpzuyCiu1SNw2a">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<captionBounds value="430,100,80,14"/>
+					<captionInternalWidth value="-2147483648"/>
+					<captionInternalHeight value="-2147483648"/>
+					<captionVisible value="true"/>
+					<captionSide value="1"/>
+					<properties>
+						<abackground value="Cr:122,207,245,255"/>
+						<aforeground value="Cr:0,0,0,255"/>
+						<azOrder value="-1"/>
+						<acreatorDiagramType value="ClassDiagram"/>
+						<aselectable value="true"/>
+						<arequestResetCaption value="false"/>
+						<arequestResetCaptionSize value="false"/>
+						<aconnectorStyle value="3"/>
+						<aconnectorLineJumps value="4"/>
+						<aconnectorLabelOrientation value="4"/>
+						<afromShapeXDiff value="0"/>
+						<afromShapeYDiff value="0"/>
+						<atoShapeXDiff value="0"/>
+						<atoShapeYDiff value="0"/>
+						<afromConnectType value="0"/>
+						<atoConnectType value="0"/>
+						<auseFromShapeCenter value="true"/>
+						<auseToShapeCenter value="true"/>
+						<afromPinType value="1"/>
+						<atoPinType value="1"/>
+						<arequestRebuild value="false"/>
+						<ashowConnectorName value="2"/>
+						<apaintThroughLabel value="2"/>
+						<ahasRoleAShape value="false"/>
+						<ahasRoleBShape value="false"/>
+						<ashowMultiplicityConstraints value="false"/>
+						<ahasMultiplicityAShape value="false"/>
+						<ahasMultiplicityBShape value="false"/>
+						<a0SwDr value="false"/>
+						<ashowStereotypes value="true"/>
+						<ashowFromRoleName value="true"/>
+						<ashowToRoleName value="true"/>
+						<ashowFromMultiplicity value="true"/>
+						<ashowToMultiplicity value="true"/>
+						<ashowFromRoleVisibility value="true"/>
+						<ashowToRoleVisibility value="true"/>
+						<ashowAssociationEndPropertyStrings value="false"/>
+						<ahasAssociationEndPropertyStringsAShape value="false"/>
+						<ahasAssociationEndPropertyStringsBShape value="false"/>
+						<afromRoleInternalWidth value="-2147483648"/>
+						<afromRoleInternalHeight value="-2147483648"/>
+						<atoRoleInternalWidth value="-2147483648"/>
+						<atoRoleInternalHeight value="-2147483648"/>
+						<afromMultiplicityInternalWidth value="-2147483648"/>
+						<afromMultiplicityInternalHeight value="-2147483648"/>
+						<atoMultiplicityInternalWidth value="-2147483648"/>
+						<atoMultiplicityInternalHeight value="-2147483648"/>
+						<aassociationEndPropertyStringsAInternalWidth value="-2147483648"/>
+						<aassociationEndPropertyStringsAInternalHeight value="-2147483648"/>
+						<aassociationEndPropertyStringsBInternalWidth value="-2147483648"/>
+						<aassociationEndPropertyStringsBInternalHeight value="-2147483648"/>
+					</properties>
+				</xmi:Extension>
+				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
+				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
+			</uml:DiagramElement>
+			<uml:DiagramElement geometry="370,159;370,120;290,120;290,190;339,190;" preferredShapeType="Association" subject="UOcpzuyCiu1SNw2h" xmi:id="0OcpzuyCiu1SNw2m">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<captionBounds value="260,100,106,14"/>
+					<captionInternalWidth value="-2147483648"/>
+					<captionInternalHeight value="-2147483648"/>
+					<captionVisible value="true"/>
+					<captionSide value="1"/>
+					<properties>
+						<abackground value="Cr:122,207,245,255"/>
+						<aforeground value="Cr:0,0,0,255"/>
+						<azOrder value="-1"/>
+						<acreatorDiagramType value="ClassDiagram"/>
+						<aselectable value="true"/>
+						<arequestResetCaption value="false"/>
+						<arequestResetCaptionSize value="false"/>
+						<aconnectorStyle value="3"/>
+						<aconnectorLineJumps value="4"/>
+						<aconnectorLabelOrientation value="4"/>
+						<afromShapeXDiff value="0"/>
+						<afromShapeYDiff value="0"/>
+						<atoShapeXDiff value="0"/>
+						<atoShapeYDiff value="0"/>
+						<afromConnectType value="0"/>
+						<atoConnectType value="0"/>
+						<auseFromShapeCenter value="true"/>
+						<auseToShapeCenter value="true"/>
+						<afromPinType value="1"/>
+						<atoPinType value="1"/>
+						<arequestRebuild value="false"/>
+						<ashowConnectorName value="2"/>
+						<apaintThroughLabel value="2"/>
+						<ahasRoleAShape value="false"/>
+						<ahasRoleBShape value="false"/>
+						<ashowMultiplicityConstraints value="false"/>
+						<ahasMultiplicityAShape value="false"/>
+						<ahasMultiplicityBShape value="false"/>
+						<a0SwDr value="false"/>
+						<ashowStereotypes value="true"/>
+						<ashowFromRoleName value="true"/>
+						<ashowToRoleName value="true"/>
+						<ashowFromMultiplicity value="true"/>
+						<ashowToMultiplicity value="true"/>
+						<ashowFromRoleVisibility value="true"/>
+						<ashowToRoleVisibility value="true"/>
+						<ashowAssociationEndPropertyStrings value="false"/>
+						<ahasAssociationEndPropertyStringsAShape value="false"/>
+						<ahasAssociationEndPropertyStringsBShape value="false"/>
+						<afromRoleInternalWidth value="-2147483648"/>
+						<afromRoleInternalHeight value="-2147483648"/>
+						<atoRoleInternalWidth value="-2147483648"/>
+						<atoRoleInternalHeight value="-2147483648"/>
+						<afromMultiplicityInternalWidth value="-2147483648"/>
+						<afromMultiplicityInternalHeight value="-2147483648"/>
+						<atoMultiplicityInternalWidth value="-2147483648"/>
+						<atoMultiplicityInternalHeight value="-2147483648"/>
+						<aassociationEndPropertyStringsAInternalWidth value="-2147483648"/>
+						<aassociationEndPropertyStringsAInternalHeight value="-2147483648"/>
+						<aassociationEndPropertyStringsBInternalWidth value="-2147483648"/>
+						<aassociationEndPropertyStringsBInternalHeight value="-2147483648"/>
+					</properties>
+				</xmi:Extension>
+				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
+				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
+			</uml:DiagramElement>
+		</uml:Diagram.element>
+	</uml:Diagram>
+	<uml:Diagram diagramType="ClassDiagram" documentation="" name="Component5" toolName="Visual Paradigm for UML" xmi:id="cTrhLuyCiu1SNw3S">
+		<xmi:Extension extender="Visual Paradigm for UML">
+			<properties>
+				<apmAuthor value="lavm"/>
+				<apmCreateDateTime value="1337689857166"/>
+				<apmLastModified value="1337806342674"/>
+				<ashowPackageNameStyle value="0"/>
+				<ashowConnectorName value="0"/>
+				<apaintConnectorThroughLabel value="0"/>
+				<ashowActivityStateNodeCaption value="65535"/>
+				<aeditable value="true"/>
+				<afollowDiagramParentElement value="true"/>
+				<aautoFitShapesSize value="false"/>
+				<ashowTaggedValues value="false"/>
+				<ashowStereotypes value="true"/>
+				<ashowConstraints value="false"/>
+				<aalignToGrid value="false"/>
+				<agridVisible value="false"/>
+				<agridWidth value="10"/>
+				<agridHeight value="10"/>
+				<agridColor value="Cr:192,192,192,255"/>
+				<adiagramBackground value="Cr:255,255,255,255"/>
+				<aconnectorStyle value="1"/>
+				<aconnectorLineJumps value="0"/>
+				<aconnectorLineJumpsSize value="0"/>
+				<aconnectionPointStyle value="0"/>
+				<aconnectorLabelOrientation value="0"/>
+				<amodelElementNameAlignment value="4"/>
+				<azoomRatio value="1.0"/>
+				<amaximized value="false"/>
+				<ax value="0"/>
+				<ay value="0"/>
+				<awidth value="1235"/>
+				<aheight value="505"/>
+				<aqualityScore value="-1"/>
+				<aparentModel value="xgHhLuyCiu1SNw3Y"/>
+				<a_globalPaletteOption value="true"/>
+				<a_alwaysShowReferenceAndSubdiagramResource value="false"/>
+				<ainitializeDiagramForCreate value="true"/>
+				<arequestValidateSnapToGrid value="false"/>
+				<ashowDefaultPackage value="true"/>
+				<adefaultPackage value="xgHhLuyCiu1SNw3Y"/>
+				<ashowAttributeGetterSetter value="false"/>
+				<ashowClassOwner value="2"/>
+				<ashowPackageOwner value="2"/>
+				<ashowTemplateInfoOfGeneralizationAndRealization value="false"/>
+				<asuppressImplied1MultiplicityForAttributeAndAssociationEnd value="false"/>
+				<ashowClassEmptyCompartments value="2"/>
+				<ashowAttributesCodeDetails value="2"/>
+				<ashowAttributesType value="1"/>
+				<ashowOperationsParameters value="1"/>
+				<ashowOperationsReturnType value="1"/>
+				<ashowOperationsCodeDetails value="2"/>
+				<ashowParametersCodeDetails value="2"/>
+				<ashowEllipsisForUnshownClassMembers value="2"/>
+				<ageneralizationSetNotation value="2"/>
+			</properties>
+		</xmi:Extension>
+		<uml:Diagram.element>
+			<uml:DiagramElement geometry="420,110,80,50" preferredShapeType="Class" subject="m6xjmuyEwTiAAgLk" xmi:id="cEnhLuyCiu1SNw3a">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<captionBounds value="0,0,80,14"/>
+					<captionInternalWidth value="-2147483648"/>
+					<captionInternalHeight value="-2147483648"/>
+					<captionVisible value="true"/>
+					<captionSide value="12"/>
+					<properties>
+						<abackground value="Cr:122,207,245,255"/>
+						<aforeground value="Cr:0,0,0,255"/>
+						<azOrder value="5"/>
+						<aselectable value="true"/>
+						<arequestResetCaption value="false"/>
+						<arequestResetCaptionSize value="false"/>
+						<adisplayStereotypeIcon value="false"/>
+						<aoverrideAppearanceWithStereotypeIcon value="true"/>
+						<arequestSetSizeOption value="0"/>
+						<aparentConnectorHeaderLength value="40"/>
+						<aparentConnectorLineLength value="10"/>
+						<aconnectToPoint value="true"/>
+						<aparentConnectorDTheta value="0.0"/>
+						<aconnectionPointType value="2"/>
+						<amodelElementNameAlignment value="9"/>
+						<arequestDefaultSize value="false"/>
+						<arequestFitSize value="false"/>
+						<arequestFitSizeFromCenter value="false"/>
+						<adisplayAsRobustnessAnalysisIcon value="true"/>
+						<avisibilityStyle value="1"/>
+						<ashowAttributeType value="1"/>
+						<ashowOperationType value="1"/>
+						<amSwTpPts value="true"/>
+						<alshRfAts value="true"/>
+						<amShDrAt value="false"/>
+						<akShDrOp value="false"/>
+						<akSwCsMbSt value="true"/>
+						<ashowClassMemberConstraints value="true"/>
+						<alShCmMl value="false"/>
+						<ashowOperationParameterDirection value="false"/>
+						<ashowOperationRaisedExceptions value="false"/>
+						<ashowParameterNameInOperationSignature value="true"/>
+						<ashowOperationTemplateParameters value="false"/>
+						<ashowOperationProperties value="false"/>
+						<awpMbs value="false"/>
+						<aattributeSortType value="0"/>
+						<aoperationSortType value="0"/>
+						<ashowInitialAttributeValue value="true"/>
+						<ashowOperationSignature value="true"/>
+						<ainterfaceBall value="false"/>
+						<ashowEmptyCompartments value="0"/>
+						<ashowEllipsisForUnshownMembers value="0"/>
+						<ashowAttributesCodeDetails value="0"/>
+						<ashowOperationsCodeDetails value="0"/>
+						<ashowParametersCodeDetails value="0"/>
+						<ashowTypeOption value="0"/>
+						<ashowOwnerOption value="3"/>
+						<ashowAttributesType value="0"/>
+						<ashowOperationsParameters value="0"/>
+						<ashowOperationsReturnType value="0"/>
+					</properties>
+				</xmi:Extension>
+				<elementFill color1="Cr:122,207,245,255" color2="" style="1" transparency="0" type="1"/>
+				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
+				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
+			</uml:DiagramElement>
+			<uml:DiagramElement geometry="138,110,105,40" preferredShapeType="Class" subject="XlvhLuyCiu1SNw38" xmi:id="XlvhLuyCiu1SNw37">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<captionBounds value="0,0,105,28"/>
+					<captionInternalWidth value="-2147483648"/>
+					<captionInternalHeight value="-2147483648"/>
+					<captionVisible value="true"/>
+					<captionSide value="12"/>
+					<properties>
+						<abackground value="Cr:179,214,249,255"/>
+						<aforeground value="Cr:0,0,0,255"/>
+						<azOrder value="2"/>
+						<acreatorDiagramType value="ClassDiagram"/>
+						<aselectable value="true"/>
+						<arequestResetCaption value="false"/>
+						<arequestResetCaptionSize value="false"/>
+						<adisplayStereotypeIcon value="false"/>
+						<aoverrideAppearanceWithStereotypeIcon value="true"/>
+						<arequestSetSizeOption value="0"/>
+						<aparentConnectorHeaderLength value="40"/>
+						<aparentConnectorLineLength value="10"/>
+						<aconnectToPoint value="true"/>
+						<aparentConnectorDTheta value="0.0"/>
+						<aconnectionPointType value="2"/>
+						<amodelElementNameAlignment value="9"/>
+						<arequestDefaultSize value="false"/>
+						<arequestFitSize value="false"/>
+						<arequestFitSizeFromCenter value="false"/>
+						<adisplayAsRobustnessAnalysisIcon value="true"/>
+						<avisibilityStyle value="1"/>
+						<ashowAttributeType value="1"/>
+						<ashowOperationType value="1"/>
+						<amSwTpPts value="true"/>
+						<alshRfAts value="true"/>
+						<amShDrAt value="false"/>
+						<akShDrOp value="false"/>
+						<akSwCsMbSt value="true"/>
+						<ashowClassMemberConstraints value="true"/>
+						<alShCmMl value="false"/>
+						<ashowOperationParameterDirection value="false"/>
+						<ashowOperationRaisedExceptions value="false"/>
+						<ashowParameterNameInOperationSignature value="true"/>
+						<ashowOperationTemplateParameters value="false"/>
+						<ashowOperationProperties value="false"/>
+						<awpMbs value="false"/>
+						<aattributeSortType value="0"/>
+						<aoperationSortType value="0"/>
+						<ashowInitialAttributeValue value="true"/>
+						<ashowOperationSignature value="true"/>
+						<ainterfaceBall value="false"/>
+						<ashowEmptyCompartments value="0"/>
+						<ashowEllipsisForUnshownMembers value="0"/>
+						<ashowAttributesCodeDetails value="0"/>
+						<ashowOperationsCodeDetails value="0"/>
+						<ashowParametersCodeDetails value="0"/>
+						<ashowTypeOption value="0"/>
+						<ashowOwnerOption value="3"/>
+						<ashowAttributesType value="0"/>
+						<ashowOperationsParameters value="0"/>
+						<ashowOperationsReturnType value="0"/>
+					</properties>
+				</xmi:Extension>
+				<elementFill color1="Cr:179,214,249,255" color2="" style="1" transparency="0" type="1"/>
+				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
+				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
+			</uml:DiagramElement>
+			<uml:DiagramElement geometry="419,120;243,120;" preferredShapeType="Generalization" subject="gt_hLuyCiu1SNw4A" xmi:id="gt_hLuyCiu1SNw4B">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<captionBounds value="321,130,20,0"/>
+					<captionInternalWidth value="-2147483648"/>
+					<captionInternalHeight value="-2147483648"/>
+					<captionVisible value="true"/>
+					<captionSide value="1"/>
+					<properties>
+						<abackground value="Cr:255,255,255,255"/>
+						<aforeground value="Cr:0,0,0,255"/>
+						<azOrder value="-1"/>
+						<acreatorDiagramType value="ClassDiagram"/>
+						<aselectable value="true"/>
+						<arequestResetCaption value="false"/>
+						<arequestResetCaptionSize value="false"/>
+						<aconnectorStyle value="3"/>
+						<aconnectorLineJumps value="4"/>
+						<aconnectorLabelOrientation value="4"/>
+						<afromShapeXDiff value="0"/>
+						<afromShapeYDiff value="0"/>
+						<atoShapeXDiff value="0"/>
+						<atoShapeYDiff value="0"/>
+						<afromConnectType value="0"/>
+						<atoConnectType value="0"/>
+						<auseFromShapeCenter value="true"/>
+						<auseToShapeCenter value="true"/>
+						<afromPinType value="1"/>
+						<atoPinType value="1"/>
+						<arequestRebuild value="false"/>
+						<ashowConnectorName value="2"/>
+						<apaintThroughLabel value="2"/>
+					</properties>
+				</xmi:Extension>
+				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
+				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
+			</uml:DiagramElement>
+			<uml:DiagramElement geometry="419,140;243,140;" preferredShapeType="Association" subject="FwURLuyCiu1SNw4J" xmi:id="FwURLuyCiu1SNw4O">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<captionBounds value="270,142,109,14"/>
+					<captionInternalWidth value="-2147483648"/>
+					<captionInternalHeight value="-2147483648"/>
+					<captionVisible value="true"/>
+					<captionSide value="1"/>
+					<properties>
+						<abackground value="Cr:122,207,245,255"/>
+						<aforeground value="Cr:0,0,0,255"/>
+						<azOrder value="-1"/>
+						<acreatorDiagramType value="ClassDiagram"/>
+						<aselectable value="true"/>
+						<arequestResetCaption value="false"/>
+						<arequestResetCaptionSize value="false"/>
+						<aconnectorStyle value="3"/>
+						<aconnectorLineJumps value="4"/>
+						<aconnectorLabelOrientation value="4"/>
+						<afromShapeXDiff value="0"/>
+						<afromShapeYDiff value="0"/>
+						<atoShapeXDiff value="0"/>
+						<atoShapeYDiff value="0"/>
+						<afromConnectType value="0"/>
+						<atoConnectType value="0"/>
+						<auseFromShapeCenter value="true"/>
+						<auseToShapeCenter value="true"/>
+						<afromPinType value="1"/>
+						<atoPinType value="1"/>
+						<arequestRebuild value="false"/>
+						<ashowConnectorName value="2"/>
+						<apaintThroughLabel value="2"/>
+						<ahasRoleAShape value="false"/>
+						<ahasRoleBShape value="false"/>
+						<ashowMultiplicityConstraints value="false"/>
+						<ahasMultiplicityAShape value="false"/>
+						<ahasMultiplicityBShape value="false"/>
+						<a0SwDr value="false"/>
+						<ashowStereotypes value="true"/>
+						<ashowFromRoleName value="true"/>
+						<ashowToRoleName value="true"/>
+						<ashowFromMultiplicity value="true"/>
+						<ashowToMultiplicity value="true"/>
+						<ashowFromRoleVisibility value="true"/>
+						<ashowToRoleVisibility value="true"/>
+						<ashowAssociationEndPropertyStrings value="false"/>
+						<ahasAssociationEndPropertyStringsAShape value="false"/>
+						<ahasAssociationEndPropertyStringsBShape value="false"/>
+						<afromRoleInternalWidth value="-2147483648"/>
+						<afromRoleInternalHeight value="-2147483648"/>
+						<atoRoleInternalWidth value="-2147483648"/>
+						<atoRoleInternalHeight value="-2147483648"/>
+						<afromMultiplicityInternalWidth value="-2147483648"/>
+						<afromMultiplicityInternalHeight value="-2147483648"/>
+						<atoMultiplicityInternalWidth value="-2147483648"/>
+						<atoMultiplicityInternalHeight value="-2147483648"/>
+						<aassociationEndPropertyStringsAInternalWidth value="-2147483648"/>
+						<aassociationEndPropertyStringsAInternalHeight value="-2147483648"/>
+						<aassociationEndPropertyStringsBInternalWidth value="-2147483648"/>
+						<aassociationEndPropertyStringsBInternalHeight value="-2147483648"/>
+					</properties>
+				</xmi:Extension>
+				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
+				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
+			</uml:DiagramElement>
+			<uml:DiagramElement geometry="280,260,120,78" preferredShapeType="Class" subject="o.cRLuyCiu1SNw4W" xmi:id="o.cRLuyCiu1SNw4V">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<captionBounds value="0,0,120,14"/>
+					<captionInternalWidth value="-2147483648"/>
+					<captionInternalHeight value="-2147483648"/>
+					<captionVisible value="true"/>
+					<captionSide value="12"/>
+					<properties>
+						<abackground value="Cr:192,192,192,255"/>
+						<aforeground value="Cr:0,0,0,255"/>
+						<azOrder value="0"/>
+						<acreatorDiagramType value="ClassDiagram"/>
+						<aselectable value="true"/>
+						<arequestResetCaption value="false"/>
+						<arequestResetCaptionSize value="false"/>
+						<adisplayStereotypeIcon value="false"/>
+						<aoverrideAppearanceWithStereotypeIcon value="true"/>
+						<arequestSetSizeOption value="0"/>
+						<aparentConnectorHeaderLength value="40"/>
+						<aparentConnectorLineLength value="10"/>
+						<aconnectToPoint value="true"/>
+						<aparentConnectorDTheta value="0.0"/>
+						<aconnectionPointType value="2"/>
+						<amodelElementNameAlignment value="9"/>
+						<arequestDefaultSize value="false"/>
+						<arequestFitSize value="false"/>
+						<arequestFitSizeFromCenter value="false"/>
+						<adisplayAsRobustnessAnalysisIcon value="true"/>
+						<avisibilityStyle value="1"/>
+						<ashowAttributeType value="1"/>
+						<ashowOperationType value="1"/>
+						<amSwTpPts value="true"/>
+						<alshRfAts value="true"/>
+						<amShDrAt value="false"/>
+						<akShDrOp value="false"/>
+						<akSwCsMbSt value="true"/>
+						<ashowClassMemberConstraints value="true"/>
+						<alShCmMl value="false"/>
+						<ashowOperationParameterDirection value="false"/>
+						<ashowOperationRaisedExceptions value="false"/>
+						<ashowParameterNameInOperationSignature value="true"/>
+						<ashowOperationTemplateParameters value="false"/>
+						<ashowOperationProperties value="false"/>
+						<awpMbs value="false"/>
+						<aattributeSortType value="0"/>
+						<aoperationSortType value="0"/>
+						<ashowInitialAttributeValue value="true"/>
+						<ashowOperationSignature value="true"/>
+						<ainterfaceBall value="false"/>
+						<ashowEmptyCompartments value="0"/>
+						<ashowEllipsisForUnshownMembers value="0"/>
+						<ashowAttributesCodeDetails value="0"/>
+						<ashowOperationsCodeDetails value="0"/>
+						<ashowParametersCodeDetails value="0"/>
+						<ashowTypeOption value="0"/>
+						<ashowOwnerOption value="3"/>
+						<ashowAttributesType value="0"/>
+						<ashowOperationsParameters value="0"/>
+						<ashowOperationsReturnType value="0"/>
+					</properties>
+				</xmi:Extension>
+				<elementFill color1="Cr:192,192,192,255" color2="" style="1" transparency="0" type="1"/>
+				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
+				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
+			</uml:DiagramElement>
+			<uml:DiagramElement geometry="380,140;380,259;" preferredShapeType="AssociationClass" subject="eyqRLuyCiu1SNw4b" xmi:id=".yqRLuyCiu1SNw4c">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<captionBounds value="350,219,20,0"/>
+					<captionInternalWidth value="-2147483648"/>
+					<captionInternalHeight value="-2147483648"/>
+					<captionVisible value="true"/>
+					<captionSide value="1"/>
+					<properties>
+						<abackground value="Cr:122,207,245,255"/>
+						<aforeground value="Cr:0,0,0,255"/>
+						<azOrder value="-1"/>
+						<aselectable value="true"/>
+						<arequestResetCaption value="false"/>
+						<arequestResetCaptionSize value="false"/>
+						<aconnectorStyle value="3"/>
+						<aconnectorLineJumps value="4"/>
+						<aconnectorLabelOrientation value="4"/>
+						<afromShapeXDiff value="0"/>
+						<afromShapeYDiff value="0"/>
+						<atoShapeXDiff value="0"/>
+						<atoShapeYDiff value="0"/>
+						<afromConnectType value="0"/>
+						<atoConnectType value="0"/>
+						<auseFromShapeCenter value="true"/>
+						<auseToShapeCenter value="true"/>
+						<afromPinType value="1"/>
+						<atoPinType value="1"/>
+						<arequestRebuild value="false"/>
+						<ashowConnectorName value="2"/>
+						<apaintThroughLabel value="2"/>
+					</properties>
+				</xmi:Extension>
+				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
+				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
+			</uml:DiagramElement>
+			<uml:DiagramElement geometry="279,300;190,300;190,150;" preferredShapeType="Association" subject="ODGRLuyCiu1SNw4f" xmi:id="ODGRLuyCiu1SNw4k">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<captionBounds value="162,307,58,14"/>
+					<captionInternalWidth value="-2147483648"/>
+					<captionInternalHeight value="-2147483648"/>
+					<captionVisible value="true"/>
+					<captionSide value="1"/>
+					<properties>
+						<abackground value="Cr:122,207,245,255"/>
+						<aforeground value="Cr:0,0,0,255"/>
+						<azOrder value="-1"/>
+						<acreatorDiagramType value="ClassDiagram"/>
+						<aselectable value="true"/>
+						<arequestResetCaption value="false"/>
+						<arequestResetCaptionSize value="false"/>
+						<aconnectorStyle value="3"/>
+						<aconnectorLineJumps value="4"/>
+						<aconnectorLabelOrientation value="4"/>
+						<afromShapeXDiff value="0"/>
+						<afromShapeYDiff value="0"/>
+						<atoShapeXDiff value="0"/>
+						<atoShapeYDiff value="0"/>
+						<afromConnectType value="0"/>
+						<atoConnectType value="0"/>
+						<auseFromShapeCenter value="true"/>
+						<auseToShapeCenter value="true"/>
+						<afromPinType value="1"/>
+						<atoPinType value="1"/>
+						<arequestRebuild value="false"/>
+						<ashowConnectorName value="2"/>
+						<apaintThroughLabel value="2"/>
+						<ahasRoleAShape value="false"/>
+						<ahasRoleBShape value="false"/>
+						<ashowMultiplicityConstraints value="false"/>
+						<ahasMultiplicityAShape value="false"/>
+						<ahasMultiplicityBShape value="false"/>
+						<a0SwDr value="false"/>
+						<ashowStereotypes value="true"/>
+						<ashowFromRoleName value="true"/>
+						<ashowToRoleName value="true"/>
+						<ashowFromMultiplicity value="true"/>
+						<ashowToMultiplicity value="true"/>
+						<ashowFromRoleVisibility value="true"/>
+						<ashowToRoleVisibility value="true"/>
+						<ashowAssociationEndPropertyStrings value="false"/>
+						<ahasAssociationEndPropertyStringsAShape value="false"/>
+						<ahasAssociationEndPropertyStringsBShape value="false"/>
+						<afromRoleInternalWidth value="-2147483648"/>
+						<afromRoleInternalHeight value="-2147483648"/>
+						<atoRoleInternalWidth value="-2147483648"/>
+						<atoRoleInternalHeight value="-2147483648"/>
+						<afromMultiplicityInternalWidth value="-2147483648"/>
+						<afromMultiplicityInternalHeight value="-2147483648"/>
+						<atoMultiplicityInternalWidth value="-2147483648"/>
+						<atoMultiplicityInternalHeight value="-2147483648"/>
+						<aassociationEndPropertyStringsAInternalWidth value="-2147483648"/>
+						<aassociationEndPropertyStringsAInternalHeight value="-2147483648"/>
+						<aassociationEndPropertyStringsBInternalWidth value="-2147483648"/>
+						<aassociationEndPropertyStringsBInternalHeight value="-2147483648"/>
+					</properties>
+				</xmi:Extension>
+				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
+				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
+			</uml:DiagramElement>
+			<uml:DiagramElement geometry="400,300;460,300;460,160;" preferredShapeType="Association" subject="mBJRLuyCiu1SNw4z" xmi:id="WBJRLuyCiu1SNw44">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<captionBounds value="432,305,52,14"/>
+					<captionInternalWidth value="-2147483648"/>
+					<captionInternalHeight value="-2147483648"/>
+					<captionVisible value="true"/>
+					<captionSide value="1"/>
+					<properties>
+						<abackground value="Cr:122,207,245,255"/>
+						<aforeground value="Cr:0,0,0,255"/>
+						<azOrder value="-1"/>
+						<acreatorDiagramType value="ClassDiagram"/>
+						<aselectable value="true"/>
+						<arequestResetCaption value="false"/>
+						<arequestResetCaptionSize value="false"/>
+						<aconnectorStyle value="3"/>
+						<aconnectorLineJumps value="4"/>
+						<aconnectorLabelOrientation value="4"/>
+						<afromShapeXDiff value="0"/>
+						<afromShapeYDiff value="0"/>
+						<atoShapeXDiff value="0"/>
+						<atoShapeYDiff value="0"/>
+						<afromConnectType value="0"/>
+						<atoConnectType value="0"/>
+						<auseFromShapeCenter value="true"/>
+						<auseToShapeCenter value="true"/>
+						<afromPinType value="1"/>
+						<atoPinType value="1"/>
+						<arequestRebuild value="false"/>
+						<ashowConnectorName value="2"/>
+						<apaintThroughLabel value="2"/>
+						<ahasRoleAShape value="false"/>
+						<ahasRoleBShape value="false"/>
+						<ashowMultiplicityConstraints value="false"/>
+						<ahasMultiplicityAShape value="false"/>
+						<ahasMultiplicityBShape value="false"/>
+						<a0SwDr value="false"/>
+						<ashowStereotypes value="true"/>
+						<ashowFromRoleName value="true"/>
+						<ashowToRoleName value="true"/>
+						<ashowFromMultiplicity value="true"/>
+						<ashowToMultiplicity value="true"/>
+						<ashowFromRoleVisibility value="true"/>
+						<ashowToRoleVisibility value="true"/>
+						<ashowAssociationEndPropertyStrings value="false"/>
+						<ahasAssociationEndPropertyStringsAShape value="false"/>
+						<ahasAssociationEndPropertyStringsBShape value="false"/>
+						<afromRoleInternalWidth value="-2147483648"/>
+						<afromRoleInternalHeight value="-2147483648"/>
+						<atoRoleInternalWidth value="-2147483648"/>
+						<atoRoleInternalHeight value="-2147483648"/>
+						<afromMultiplicityInternalWidth value="-2147483648"/>
+						<afromMultiplicityInternalHeight value="-2147483648"/>
+						<atoMultiplicityInternalWidth value="-2147483648"/>
+						<atoMultiplicityInternalHeight value="-2147483648"/>
+						<aassociationEndPropertyStringsAInternalWidth value="-2147483648"/>
+						<aassociationEndPropertyStringsAInternalHeight value="-2147483648"/>
+						<aassociationEndPropertyStringsBInternalWidth value="-2147483648"/>
+						<aassociationEndPropertyStringsBInternalHeight value="-2147483648"/>
+					</properties>
+				</xmi:Extension>
+				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
+				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
+			</uml:DiagramElement>
+		</uml:Diagram.element>
+	</uml:Diagram>
+	<uml:Diagram diagramType="ClassDiagram" documentation="" name="Component6" toolName="Visual Paradigm for UML" xmi:id="VVIJLuyCiu1SNw59">
+		<xmi:Extension extender="Visual Paradigm for UML">
+			<properties>
+				<apmAuthor value="lavm"/>
+				<apmCreateDateTime value="1337690442410"/>
+				<apmLastModified value="1337875819124"/>
+				<ashowPackageNameStyle value="0"/>
+				<ashowConnectorName value="0"/>
+				<apaintConnectorThroughLabel value="0"/>
+				<ashowActivityStateNodeCaption value="65535"/>
+				<aeditable value="true"/>
+				<afollowDiagramParentElement value="true"/>
+				<aautoFitShapesSize value="false"/>
+				<ashowTaggedValues value="false"/>
+				<ashowStereotypes value="true"/>
+				<ashowConstraints value="false"/>
+				<aalignToGrid value="true"/>
+				<agridVisible value="false"/>
+				<agridWidth value="10"/>
+				<agridHeight value="10"/>
+				<agridColor value="Cr:192,192,192,255"/>
+				<adiagramBackground value="Cr:255,255,255,255"/>
+				<aconnectorStyle value="1"/>
+				<aconnectorLineJumps value="0"/>
+				<aconnectorLineJumpsSize value="0"/>
+				<aconnectionPointStyle value="0"/>
+				<aconnectorLabelOrientation value="0"/>
+				<amodelElementNameAlignment value="4"/>
+				<azoomRatio value="1.0"/>
+				<amaximized value="true"/>
+				<ax value="0"/>
+				<ay value="0"/>
+				<awidth value="1235"/>
+				<aheight value="653"/>
+				<aqualityScore value="-1"/>
+				<aparentModel value="NVoJLuyCiu1SNw6D"/>
+				<a_globalPaletteOption value="true"/>
+				<a_alwaysShowReferenceAndSubdiagramResource value="false"/>
+				<ainitializeDiagramForCreate value="true"/>
+				<arequestValidateSnapToGrid value="false"/>
+				<ashowDefaultPackage value="true"/>
+				<adefaultPackage value="NVoJLuyCiu1SNw6D"/>
+				<ashowAttributeGetterSetter value="false"/>
+				<ashowClassOwner value="2"/>
+				<ashowPackageOwner value="2"/>
+				<ashowTemplateInfoOfGeneralizationAndRealization value="false"/>
+				<asuppressImplied1MultiplicityForAttributeAndAssociationEnd value="false"/>
+				<ashowClassEmptyCompartments value="2"/>
+				<ashowAttributesCodeDetails value="2"/>
+				<ashowAttributesType value="1"/>
+				<ashowOperationsParameters value="1"/>
+				<ashowOperationsReturnType value="1"/>
+				<ashowOperationsCodeDetails value="2"/>
+				<ashowParametersCodeDetails value="2"/>
+				<ashowEllipsisForUnshownClassMembers value="2"/>
+				<ageneralizationSetNotation value="2"/>
+			</properties>
+		</xmi:Extension>
+		<uml:Diagram.element>
+			<uml:DiagramElement geometry="320,40,80,50" preferredShapeType="Class" subject="m6xjmuyEwTiAAgLk" xmi:id="iE4JLuyCiu1SNw6F">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<captionBounds value="0,0,80,14"/>
+					<captionInternalWidth value="-2147483648"/>
+					<captionInternalHeight value="-2147483648"/>
+					<captionVisible value="true"/>
+					<captionSide value="12"/>
+					<properties>
+						<abackground value="Cr:122,207,245,255"/>
+						<aforeground value="Cr:0,0,0,255"/>
+						<azOrder value="15"/>
+						<aselectable value="true"/>
+						<arequestResetCaption value="false"/>
+						<arequestResetCaptionSize value="false"/>
+						<adisplayStereotypeIcon value="false"/>
+						<aoverrideAppearanceWithStereotypeIcon value="true"/>
+						<arequestSetSizeOption value="0"/>
+						<aparentConnectorHeaderLength value="40"/>
+						<aparentConnectorLineLength value="10"/>
+						<aconnectToPoint value="true"/>
+						<aparentConnectorDTheta value="0.0"/>
+						<aconnectionPointType value="2"/>
+						<amodelElementNameAlignment value="9"/>
+						<arequestDefaultSize value="false"/>
+						<arequestFitSize value="false"/>
+						<arequestFitSizeFromCenter value="false"/>
+						<adisplayAsRobustnessAnalysisIcon value="true"/>
+						<avisibilityStyle value="1"/>
+						<ashowAttributeType value="1"/>
+						<ashowOperationType value="1"/>
+						<amSwTpPts value="true"/>
+						<alshRfAts value="true"/>
+						<amShDrAt value="false"/>
+						<akShDrOp value="false"/>
+						<akSwCsMbSt value="true"/>
+						<ashowClassMemberConstraints value="true"/>
+						<alShCmMl value="false"/>
+						<ashowOperationParameterDirection value="false"/>
+						<ashowOperationRaisedExceptions value="false"/>
+						<ashowParameterNameInOperationSignature value="true"/>
+						<ashowOperationTemplateParameters value="false"/>
+						<ashowOperationProperties value="false"/>
+						<awpMbs value="false"/>
+						<aattributeSortType value="0"/>
+						<aoperationSortType value="0"/>
+						<ashowInitialAttributeValue value="true"/>
+						<ashowOperationSignature value="true"/>
+						<ainterfaceBall value="false"/>
+						<ashowEmptyCompartments value="0"/>
+						<ashowEllipsisForUnshownMembers value="0"/>
+						<ashowAttributesCodeDetails value="0"/>
+						<ashowOperationsCodeDetails value="0"/>
+						<ashowParametersCodeDetails value="0"/>
+						<ashowTypeOption value="0"/>
+						<ashowOwnerOption value="3"/>
+						<ashowAttributesType value="0"/>
+						<ashowOperationsParameters value="0"/>
+						<ashowOperationsReturnType value="0"/>
+					</properties>
+				</xmi:Extension>
+				<elementFill color1="Cr:122,207,245,255" color2="" style="1" transparency="0" type="1"/>
+				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
+				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
+			</uml:DiagramElement>
+			<uml:DiagramElement geometry="500,40,110,40" preferredShapeType="Class" subject="Jc2JLuyCiu1SNw6o" xmi:id="xc2JLuyCiu1SNw6n">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<captionBounds value="0,0,110,28"/>
+					<captionInternalWidth value="-2147483648"/>
+					<captionInternalHeight value="-2147483648"/>
+					<captionVisible value="true"/>
+					<captionSide value="12"/>
+					<properties>
+						<abackground value="Cr:179,214,249,255"/>
+						<aforeground value="Cr:0,0,0,255"/>
+						<azOrder value="13"/>
+						<acreatorDiagramType value="ClassDiagram"/>
+						<aselectable value="true"/>
+						<arequestResetCaption value="false"/>
+						<arequestResetCaptionSize value="false"/>
+						<adisplayStereotypeIcon value="false"/>
+						<aoverrideAppearanceWithStereotypeIcon value="true"/>
+						<arequestSetSizeOption value="0"/>
+						<aparentConnectorHeaderLength value="40"/>
+						<aparentConnectorLineLength value="10"/>
+						<aconnectToPoint value="true"/>
+						<aparentConnectorDTheta value="0.0"/>
+						<aconnectionPointType value="2"/>
+						<amodelElementNameAlignment value="9"/>
+						<arequestDefaultSize value="false"/>
+						<arequestFitSize value="false"/>
+						<arequestFitSizeFromCenter value="false"/>
+						<adisplayAsRobustnessAnalysisIcon value="true"/>
+						<avisibilityStyle value="1"/>
+						<ashowAttributeType value="1"/>
+						<ashowOperationType value="1"/>
+						<amSwTpPts value="true"/>
+						<alshRfAts value="true"/>
+						<amShDrAt value="false"/>
+						<akShDrOp value="false"/>
+						<akSwCsMbSt value="true"/>
+						<ashowClassMemberConstraints value="true"/>
+						<alShCmMl value="false"/>
+						<ashowOperationParameterDirection value="false"/>
+						<ashowOperationRaisedExceptions value="false"/>
+						<ashowParameterNameInOperationSignature value="true"/>
+						<ashowOperationTemplateParameters value="false"/>
+						<ashowOperationProperties value="false"/>
+						<awpMbs value="false"/>
+						<aattributeSortType value="0"/>
+						<aoperationSortType value="0"/>
+						<ashowInitialAttributeValue value="true"/>
+						<ashowOperationSignature value="true"/>
+						<ainterfaceBall value="false"/>
+						<ashowEmptyCompartments value="0"/>
+						<ashowEllipsisForUnshownMembers value="0"/>
+						<ashowAttributesCodeDetails value="0"/>
+						<ashowOperationsCodeDetails value="0"/>
+						<ashowParametersCodeDetails value="0"/>
+						<ashowTypeOption value="0"/>
+						<ashowOwnerOption value="3"/>
+						<ashowAttributesType value="0"/>
+						<ashowOperationsParameters value="0"/>
+						<ashowOperationsReturnType value="0"/>
+					</properties>
+				</xmi:Extension>
+				<elementFill color1="Cr:179,214,249,255" color2="" style="1" transparency="0" type="1"/>
+				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
+				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
+			</uml:DiagramElement>
+			<uml:DiagramElement geometry="400,60;499,60;" preferredShapeType="Generalization" subject="3iRJLuyCiu1SNw6t" xmi:id="3iRJLuyCiu1SNw6u">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<captionBounds value="439,60,20,0"/>
+					<captionInternalWidth value="-2147483648"/>
+					<captionInternalHeight value="-2147483648"/>
+					<captionVisible value="true"/>
+					<captionSide value="1"/>
+					<properties>
+						<abackground value="Cr:255,255,255,255"/>
+						<aforeground value="Cr:0,0,0,255"/>
+						<azOrder value="-1"/>
+						<acreatorDiagramType value="ClassDiagram"/>
+						<aselectable value="true"/>
+						<arequestResetCaption value="false"/>
+						<arequestResetCaptionSize value="false"/>
+						<aconnectorStyle value="3"/>
+						<aconnectorLineJumps value="4"/>
+						<aconnectorLabelOrientation value="4"/>
+						<afromShapeXDiff value="0"/>
+						<afromShapeYDiff value="0"/>
+						<atoShapeXDiff value="0"/>
+						<atoShapeYDiff value="0"/>
+						<afromConnectType value="0"/>
+						<atoConnectType value="0"/>
+						<auseFromShapeCenter value="true"/>
+						<auseToShapeCenter value="true"/>
+						<afromPinType value="1"/>
+						<atoPinType value="1"/>
+						<arequestRebuild value="false"/>
+						<ashowConnectorName value="2"/>
+						<apaintThroughLabel value="2"/>
+					</properties>
+				</xmi:Extension>
+				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
+				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
+			</uml:DiagramElement>
+			<uml:DiagramElement geometry="700,40,110,40" preferredShapeType="Class" subject="L9xJLuyCiu1SNw61" xmi:id="L9xJLuyCiu1SNw60">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<captionBounds value="0,0,110,28"/>
+					<captionInternalWidth value="-2147483648"/>
+					<captionInternalHeight value="-2147483648"/>
+					<captionVisible value="true"/>
+					<captionSide value="12"/>
+					<properties>
+						<abackground value="Cr:179,214,249,255"/>
+						<aforeground value="Cr:0,0,0,255"/>
+						<azOrder value="11"/>
+						<acreatorDiagramType value="ClassDiagram"/>
+						<aselectable value="true"/>
+						<arequestResetCaption value="false"/>
+						<arequestResetCaptionSize value="false"/>
+						<adisplayStereotypeIcon value="false"/>
+						<aoverrideAppearanceWithStereotypeIcon value="true"/>
+						<arequestSetSizeOption value="0"/>
+						<aparentConnectorHeaderLength value="40"/>
+						<aparentConnectorLineLength value="10"/>
+						<aconnectToPoint value="true"/>
+						<aparentConnectorDTheta value="0.0"/>
+						<aconnectionPointType value="2"/>
+						<amodelElementNameAlignment value="9"/>
+						<arequestDefaultSize value="false"/>
+						<arequestFitSize value="false"/>
+						<arequestFitSizeFromCenter value="false"/>
+						<adisplayAsRobustnessAnalysisIcon value="true"/>
+						<avisibilityStyle value="1"/>
+						<ashowAttributeType value="1"/>
+						<ashowOperationType value="1"/>
+						<amSwTpPts value="true"/>
+						<alshRfAts value="true"/>
+						<amShDrAt value="false"/>
+						<akShDrOp value="false"/>
+						<akSwCsMbSt value="true"/>
+						<ashowClassMemberConstraints value="true"/>
+						<alShCmMl value="false"/>
+						<ashowOperationParameterDirection value="false"/>
+						<ashowOperationRaisedExceptions value="false"/>
+						<ashowParameterNameInOperationSignature value="true"/>
+						<ashowOperationTemplateParameters value="false"/>
+						<ashowOperationProperties value="false"/>
+						<awpMbs value="false"/>
+						<aattributeSortType value="0"/>
+						<aoperationSortType value="0"/>
+						<ashowInitialAttributeValue value="true"/>
+						<ashowOperationSignature value="true"/>
+						<ainterfaceBall value="false"/>
+						<ashowEmptyCompartments value="0"/>
+						<ashowEllipsisForUnshownMembers value="0"/>
+						<ashowAttributesCodeDetails value="0"/>
+						<ashowOperationsCodeDetails value="0"/>
+						<ashowParametersCodeDetails value="0"/>
+						<ashowTypeOption value="0"/>
+						<ashowOwnerOption value="3"/>
+						<ashowAttributesType value="0"/>
+						<ashowOperationsParameters value="0"/>
+						<ashowOperationsReturnType value="0"/>
+					</properties>
+				</xmi:Extension>
+				<elementFill color1="Cr:179,214,249,255" color2="" style="1" transparency="0" type="1"/>
+				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
+				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
+			</uml:DiagramElement>
+			<uml:DiagramElement geometry="610,60;699,60;" preferredShapeType="Generalization" subject="ouFJLuyCiu1SNw6_" xmi:id="ouFJLuyCiu1SNw7A">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<captionBounds value="629,60,20,0"/>
+					<captionInternalWidth value="-2147483648"/>
+					<captionInternalHeight value="-2147483648"/>
+					<captionVisible value="true"/>
+					<captionSide value="1"/>
+					<properties>
+						<abackground value="Cr:255,255,255,255"/>
+						<aforeground value="Cr:0,0,0,255"/>
+						<azOrder value="-1"/>
+						<acreatorDiagramType value="ClassDiagram"/>
+						<aselectable value="true"/>
+						<arequestResetCaption value="false"/>
+						<arequestResetCaptionSize value="false"/>
+						<aconnectorStyle value="3"/>
+						<aconnectorLineJumps value="4"/>
+						<aconnectorLabelOrientation value="4"/>
+						<afromShapeXDiff value="0"/>
+						<afromShapeYDiff value="0"/>
+						<atoShapeXDiff value="0"/>
+						<atoShapeYDiff value="0"/>
+						<afromConnectType value="0"/>
+						<atoConnectType value="0"/>
+						<auseFromShapeCenter value="true"/>
+						<auseToShapeCenter value="true"/>
+						<afromPinType value="1"/>
+						<atoPinType value="1"/>
+						<arequestRebuild value="false"/>
+						<ashowConnectorName value="2"/>
+						<apaintThroughLabel value="2"/>
+					</properties>
+				</xmi:Extension>
+				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
+				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
+			</uml:DiagramElement>
+			<uml:DiagramElement geometry="90,40,110,40" preferredShapeType="Class" subject="Xw_ibuyCiu1SNxFK" xmi:id="Xw_ibuyCiu1SNxFJ">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<captionBounds value="0,0,110,28"/>
+					<captionInternalWidth value="-2147483648"/>
+					<captionInternalHeight value="-2147483648"/>
+					<captionVisible value="true"/>
+					<captionSide value="12"/>
+					<properties>
+						<abackground value="Cr:192,255,192,255"/>
+						<aforeground value="Cr:0,0,0,255"/>
+						<azOrder value="8"/>
+						<aselectable value="true"/>
+						<arequestResetCaption value="false"/>
+						<arequestResetCaptionSize value="false"/>
+						<adisplayStereotypeIcon value="false"/>
+						<aoverrideAppearanceWithStereotypeIcon value="true"/>
+						<arequestSetSizeOption value="0"/>
+						<aparentConnectorHeaderLength value="40"/>
+						<aparentConnectorLineLength value="10"/>
+						<aconnectToPoint value="true"/>
+						<aparentConnectorDTheta value="0.0"/>
+						<aconnectionPointType value="2"/>
+						<amodelElementNameAlignment value="9"/>
+						<arequestDefaultSize value="false"/>
+						<arequestFitSize value="false"/>
+						<arequestFitSizeFromCenter value="false"/>
+						<adisplayAsRobustnessAnalysisIcon value="true"/>
+						<avisibilityStyle value="1"/>
+						<ashowAttributeType value="1"/>
+						<ashowOperationType value="1"/>
+						<amSwTpPts value="true"/>
+						<alshRfAts value="true"/>
+						<amShDrAt value="false"/>
+						<akShDrOp value="false"/>
+						<akSwCsMbSt value="true"/>
+						<ashowClassMemberConstraints value="true"/>
+						<alShCmMl value="false"/>
+						<ashowOperationParameterDirection value="false"/>
+						<ashowOperationRaisedExceptions value="false"/>
+						<ashowParameterNameInOperationSignature value="true"/>
+						<ashowOperationTemplateParameters value="false"/>
+						<ashowOperationProperties value="false"/>
+						<awpMbs value="false"/>
+						<aattributeSortType value="0"/>
+						<aoperationSortType value="0"/>
+						<ashowInitialAttributeValue value="true"/>
+						<ashowOperationSignature value="true"/>
+						<ainterfaceBall value="false"/>
+						<ashowEmptyCompartments value="0"/>
+						<ashowEllipsisForUnshownMembers value="0"/>
+						<ashowAttributesCodeDetails value="0"/>
+						<ashowOperationsCodeDetails value="0"/>
+						<ashowParametersCodeDetails value="0"/>
+						<ashowTypeOption value="0"/>
+						<ashowOwnerOption value="3"/>
+						<ashowAttributesType value="0"/>
+						<ashowOperationsParameters value="0"/>
+						<ashowOperationsReturnType value="0"/>
+					</properties>
+				</xmi:Extension>
+				<elementFill color1="Cr:192,255,192,255" color2="" style="1" transparency="0" type="1"/>
+				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
+				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
+			</uml:DiagramElement>
+			<uml:DiagramElement geometry="220,160,80,40" preferredShapeType="Class" subject="h_YSbuyCiu1SNxFP" xmi:id="h_YSbuyCiu1SNxFO">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<captionBounds value="0,0,80,14"/>
+					<captionInternalWidth value="-2147483648"/>
+					<captionInternalHeight value="-2147483648"/>
+					<captionVisible value="true"/>
+					<captionSide value="12"/>
+					<properties>
+						<abackground value="Cr:122,207,245,255"/>
+						<aforeground value="Cr:0,0,0,255"/>
+						<azOrder value="6"/>
+						<acreatorDiagramType value="ClassDiagram"/>
+						<aselectable value="true"/>
+						<arequestResetCaption value="false"/>
+						<arequestResetCaptionSize value="false"/>
+						<adisplayStereotypeIcon value="false"/>
+						<aoverrideAppearanceWithStereotypeIcon value="true"/>
+						<arequestSetSizeOption value="0"/>
+						<aparentConnectorHeaderLength value="40"/>
+						<aparentConnectorLineLength value="10"/>
+						<aconnectToPoint value="true"/>
+						<aparentConnectorDTheta value="0.0"/>
+						<aconnectionPointType value="2"/>
+						<amodelElementNameAlignment value="9"/>
+						<arequestDefaultSize value="false"/>
+						<arequestFitSize value="false"/>
+						<arequestFitSizeFromCenter value="false"/>
+						<adisplayAsRobustnessAnalysisIcon value="true"/>
+						<avisibilityStyle value="1"/>
+						<ashowAttributeType value="1"/>
+						<ashowOperationType value="1"/>
+						<amSwTpPts value="true"/>
+						<alshRfAts value="true"/>
+						<amShDrAt value="false"/>
+						<akShDrOp value="false"/>
+						<akSwCsMbSt value="true"/>
+						<ashowClassMemberConstraints value="true"/>
+						<alShCmMl value="false"/>
+						<ashowOperationParameterDirection value="false"/>
+						<ashowOperationRaisedExceptions value="false"/>
+						<ashowParameterNameInOperationSignature value="true"/>
+						<ashowOperationTemplateParameters value="false"/>
+						<ashowOperationProperties value="false"/>
+						<awpMbs value="false"/>
+						<aattributeSortType value="0"/>
+						<aoperationSortType value="0"/>
+						<ashowInitialAttributeValue value="true"/>
+						<ashowOperationSignature value="true"/>
+						<ainterfaceBall value="false"/>
+						<ashowEmptyCompartments value="0"/>
+						<ashowEllipsisForUnshownMembers value="0"/>
+						<ashowAttributesCodeDetails value="0"/>
+						<ashowOperationsCodeDetails value="0"/>
+						<ashowParametersCodeDetails value="0"/>
+						<ashowTypeOption value="0"/>
+						<ashowOwnerOption value="3"/>
+						<ashowAttributesType value="0"/>
+						<ashowOperationsParameters value="0"/>
+						<ashowOperationsReturnType value="0"/>
+					</properties>
+				</xmi:Extension>
+				<elementFill color1="Cr:122,207,245,255" color2="" style="1" transparency="0" type="1"/>
+				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
+				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
+			</uml:DiagramElement>
+			<uml:DiagramElement geometry="240,159;240,60;200,60;" preferredShapeType="Association" subject="b1USbuyCiu1SNxFU" xmi:id="b1USbuyCiu1SNxFZ">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<captionBounds value="240,90,20,0"/>
+					<captionInternalWidth value="-2147483648"/>
+					<captionInternalHeight value="-2147483648"/>
+					<captionVisible value="true"/>
+					<captionSide value="1"/>
+					<properties>
+						<abackground value="Cr:122,207,245,255"/>
+						<aforeground value="Cr:0,0,0,255"/>
+						<azOrder value="-1"/>
+						<acreatorDiagramType value="ClassDiagram"/>
+						<aselectable value="true"/>
+						<arequestResetCaption value="false"/>
+						<arequestResetCaptionSize value="false"/>
+						<aconnectorStyle value="3"/>
+						<aconnectorLineJumps value="4"/>
+						<aconnectorLabelOrientation value="4"/>
+						<afromShapeXDiff value="0"/>
+						<afromShapeYDiff value="0"/>
+						<atoShapeXDiff value="0"/>
+						<atoShapeYDiff value="0"/>
+						<afromConnectType value="0"/>
+						<atoConnectType value="0"/>
+						<auseFromShapeCenter value="true"/>
+						<auseToShapeCenter value="true"/>
+						<afromPinType value="1"/>
+						<atoPinType value="1"/>
+						<arequestRebuild value="false"/>
+						<ashowConnectorName value="2"/>
+						<apaintThroughLabel value="2"/>
+						<ahasRoleAShape value="false"/>
+						<ahasRoleBShape value="false"/>
+						<ashowMultiplicityConstraints value="false"/>
+						<ahasMultiplicityAShape value="false"/>
+						<ahasMultiplicityBShape value="false"/>
+						<a0SwDr value="false"/>
+						<ashowStereotypes value="true"/>
+						<ashowFromRoleName value="true"/>
+						<ashowToRoleName value="true"/>
+						<ashowFromMultiplicity value="true"/>
+						<ashowToMultiplicity value="true"/>
+						<ashowFromRoleVisibility value="true"/>
+						<ashowToRoleVisibility value="true"/>
+						<ashowAssociationEndPropertyStrings value="false"/>
+						<ahasAssociationEndPropertyStringsAShape value="false"/>
+						<ahasAssociationEndPropertyStringsBShape value="false"/>
+						<afromRoleInternalWidth value="-2147483648"/>
+						<afromRoleInternalHeight value="-2147483648"/>
+						<atoRoleInternalWidth value="-2147483648"/>
+						<atoRoleInternalHeight value="-2147483648"/>
+						<afromMultiplicityInternalWidth value="-2147483648"/>
+						<afromMultiplicityInternalHeight value="-2147483648"/>
+						<atoMultiplicityInternalWidth value="-2147483648"/>
+						<atoMultiplicityInternalHeight value="-2147483648"/>
+						<aassociationEndPropertyStringsAInternalWidth value="-2147483648"/>
+						<aassociationEndPropertyStringsAInternalHeight value="-2147483648"/>
+						<aassociationEndPropertyStringsBInternalWidth value="-2147483648"/>
+						<aassociationEndPropertyStringsBInternalHeight value="-2147483648"/>
+					</properties>
+				</xmi:Extension>
+				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
+				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
+			</uml:DiagramElement>
+			<uml:DiagramElement geometry="280,159;280,60;319,60;" preferredShapeType="Association" subject="gCsSbuyCiu1SNxFe" xmi:id="gCsSbuyCiu1SNxFj">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<captionBounds value="281,90,20,0"/>
+					<captionInternalWidth value="-2147483648"/>
+					<captionInternalHeight value="-2147483648"/>
+					<captionVisible value="true"/>
+					<captionSide value="1"/>
+					<properties>
+						<abackground value="Cr:122,207,245,255"/>
+						<aforeground value="Cr:0,0,0,255"/>
+						<azOrder value="-1"/>
+						<acreatorDiagramType value="ClassDiagram"/>
+						<aselectable value="true"/>
+						<arequestResetCaption value="false"/>
+						<arequestResetCaptionSize value="false"/>
+						<aconnectorStyle value="3"/>
+						<aconnectorLineJumps value="4"/>
+						<aconnectorLabelOrientation value="4"/>
+						<afromShapeXDiff value="0"/>
+						<afromShapeYDiff value="0"/>
+						<atoShapeXDiff value="0"/>
+						<atoShapeYDiff value="0"/>
+						<afromConnectType value="0"/>
+						<atoConnectType value="0"/>
+						<auseFromShapeCenter value="true"/>
+						<auseToShapeCenter value="true"/>
+						<afromPinType value="1"/>
+						<atoPinType value="1"/>
+						<arequestRebuild value="false"/>
+						<ashowConnectorName value="2"/>
+						<apaintThroughLabel value="2"/>
+						<ahasRoleAShape value="false"/>
+						<ahasRoleBShape value="false"/>
+						<ashowMultiplicityConstraints value="false"/>
+						<ahasMultiplicityAShape value="false"/>
+						<ahasMultiplicityBShape value="false"/>
+						<a0SwDr value="false"/>
+						<ashowStereotypes value="true"/>
+						<ashowFromRoleName value="true"/>
+						<ashowToRoleName value="true"/>
+						<ashowFromMultiplicity value="true"/>
+						<ashowToMultiplicity value="true"/>
+						<ashowFromRoleVisibility value="true"/>
+						<ashowToRoleVisibility value="true"/>
+						<ashowAssociationEndPropertyStrings value="false"/>
+						<ahasAssociationEndPropertyStringsAShape value="false"/>
+						<ahasAssociationEndPropertyStringsBShape value="false"/>
+						<afromRoleInternalWidth value="-2147483648"/>
+						<afromRoleInternalHeight value="-2147483648"/>
+						<atoRoleInternalWidth value="-2147483648"/>
+						<atoRoleInternalHeight value="-2147483648"/>
+						<afromMultiplicityInternalWidth value="-2147483648"/>
+						<afromMultiplicityInternalHeight value="-2147483648"/>
+						<atoMultiplicityInternalWidth value="-2147483648"/>
+						<atoMultiplicityInternalHeight value="-2147483648"/>
+						<aassociationEndPropertyStringsAInternalWidth value="-2147483648"/>
+						<aassociationEndPropertyStringsAInternalHeight value="-2147483648"/>
+						<aassociationEndPropertyStringsBInternalWidth value="-2147483648"/>
+						<aassociationEndPropertyStringsBInternalHeight value="-2147483648"/>
+					</properties>
+				</xmi:Extension>
+				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
+				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
+			</uml:DiagramElement>
+			<uml:DiagramElement geometry="740,80;740,160;670,160;670,70;699,70;" preferredShapeType="Association" subject="MMoybuyCiu1SNxF6" xmi:id="sMoybuyCiu1SNxF_">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<captionBounds value="620,170,67,14"/>
+					<captionInternalWidth value="-2147483648"/>
+					<captionInternalHeight value="-2147483648"/>
+					<captionVisible value="true"/>
+					<captionSide value="1"/>
+					<properties>
+						<abackground value="Cr:122,207,245,255"/>
+						<aforeground value="Cr:0,0,0,255"/>
+						<azOrder value="-1"/>
+						<acreatorDiagramType value="ClassDiagram"/>
+						<aselectable value="true"/>
+						<arequestResetCaption value="false"/>
+						<arequestResetCaptionSize value="false"/>
+						<aconnectorStyle value="3"/>
+						<aconnectorLineJumps value="4"/>
+						<aconnectorLabelOrientation value="4"/>
+						<afromShapeXDiff value="0"/>
+						<afromShapeYDiff value="0"/>
+						<atoShapeXDiff value="0"/>
+						<atoShapeYDiff value="0"/>
+						<afromConnectType value="0"/>
+						<atoConnectType value="0"/>
+						<auseFromShapeCenter value="true"/>
+						<auseToShapeCenter value="true"/>
+						<afromPinType value="1"/>
+						<atoPinType value="1"/>
+						<arequestRebuild value="false"/>
+						<ashowConnectorName value="2"/>
+						<apaintThroughLabel value="2"/>
+						<ahasRoleAShape value="false"/>
+						<ahasRoleBShape value="false"/>
+						<ashowMultiplicityConstraints value="false"/>
+						<ahasMultiplicityAShape value="false"/>
+						<ahasMultiplicityBShape value="false"/>
+						<a0SwDr value="false"/>
+						<ashowStereotypes value="true"/>
+						<ashowFromRoleName value="true"/>
+						<ashowToRoleName value="true"/>
+						<ashowFromMultiplicity value="true"/>
+						<ashowToMultiplicity value="true"/>
+						<ashowFromRoleVisibility value="true"/>
+						<ashowToRoleVisibility value="true"/>
+						<ashowAssociationEndPropertyStrings value="false"/>
+						<ahasAssociationEndPropertyStringsAShape value="false"/>
+						<ahasAssociationEndPropertyStringsBShape value="false"/>
+						<afromRoleInternalWidth value="-2147483648"/>
+						<afromRoleInternalHeight value="-2147483648"/>
+						<atoRoleInternalWidth value="-2147483648"/>
+						<atoRoleInternalHeight value="-2147483648"/>
+						<afromMultiplicityInternalWidth value="-2147483648"/>
+						<afromMultiplicityInternalHeight value="-2147483648"/>
+						<atoMultiplicityInternalWidth value="-2147483648"/>
+						<atoMultiplicityInternalHeight value="-2147483648"/>
+						<aassociationEndPropertyStringsAInternalWidth value="-2147483648"/>
+						<aassociationEndPropertyStringsAInternalHeight value="-2147483648"/>
+						<aassociationEndPropertyStringsBInternalWidth value="-2147483648"/>
+						<aassociationEndPropertyStringsBInternalHeight value="-2147483648"/>
+					</properties>
+				</xmi:Extension>
+				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
+				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
+			</uml:DiagramElement>
+			<uml:DiagramElement geometry="470,160,80,50" preferredShapeType="Class" subject="YmaybuyCiu1SNxGR" xmi:id="YmaybuyCiu1SNxGQ">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<captionBounds value="0,0,80,14"/>
+					<captionInternalWidth value="-2147483648"/>
+					<captionInternalHeight value="-2147483648"/>
+					<captionVisible value="true"/>
+					<captionSide value="12"/>
+					<properties>
+						<abackground value="Cr:192,192,192,255"/>
+						<aforeground value="Cr:0,0,0,255"/>
+						<azOrder value="4"/>
+						<acreatorDiagramType value="ClassDiagram"/>
+						<aselectable value="true"/>
+						<arequestResetCaption value="false"/>
+						<arequestResetCaptionSize value="false"/>
+						<adisplayStereotypeIcon value="false"/>
+						<aoverrideAppearanceWithStereotypeIcon value="true"/>
+						<arequestSetSizeOption value="0"/>
+						<aparentConnectorHeaderLength value="40"/>
+						<aparentConnectorLineLength value="10"/>
+						<aconnectToPoint value="true"/>
+						<aparentConnectorDTheta value="0.0"/>
+						<aconnectionPointType value="2"/>
+						<amodelElementNameAlignment value="9"/>
+						<arequestDefaultSize value="false"/>
+						<arequestFitSize value="false"/>
+						<arequestFitSizeFromCenter value="false"/>
+						<adisplayAsRobustnessAnalysisIcon value="true"/>
+						<avisibilityStyle value="1"/>
+						<ashowAttributeType value="1"/>
+						<ashowOperationType value="1"/>
+						<amSwTpPts value="true"/>
+						<alshRfAts value="true"/>
+						<amShDrAt value="false"/>
+						<akShDrOp value="false"/>
+						<akSwCsMbSt value="true"/>
+						<ashowClassMemberConstraints value="true"/>
+						<alShCmMl value="false"/>
+						<ashowOperationParameterDirection value="false"/>
+						<ashowOperationRaisedExceptions value="false"/>
+						<ashowParameterNameInOperationSignature value="true"/>
+						<ashowOperationTemplateParameters value="false"/>
+						<ashowOperationProperties value="false"/>
+						<awpMbs value="false"/>
+						<aattributeSortType value="0"/>
+						<aoperationSortType value="0"/>
+						<ashowInitialAttributeValue value="true"/>
+						<ashowOperationSignature value="true"/>
+						<ainterfaceBall value="false"/>
+						<ashowEmptyCompartments value="0"/>
+						<ashowEllipsisForUnshownMembers value="0"/>
+						<ashowAttributesCodeDetails value="0"/>
+						<ashowOperationsCodeDetails value="0"/>
+						<ashowParametersCodeDetails value="0"/>
+						<ashowTypeOption value="0"/>
+						<ashowOwnerOption value="3"/>
+						<ashowAttributesType value="0"/>
+						<ashowOperationsParameters value="0"/>
+						<ashowOperationsReturnType value="0"/>
+					</properties>
+				</xmi:Extension>
+				<elementFill color1="Cr:192,192,192,255" color2="" style="1" transparency="0" type="1"/>
+				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
+				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
+			</uml:DiagramElement>
+			<uml:DiagramElement geometry="690,160;690,190;550,190;" preferredShapeType="AssociationClass" subject="fpOybuyCiu1SNxGW" xmi:id="fpOybuyCiu1SNxGX">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<captionBounds value="586,218,20,0"/>
+					<captionInternalWidth value="-2147483648"/>
+					<captionInternalHeight value="-2147483648"/>
+					<captionVisible value="true"/>
+					<captionSide value="1"/>
+					<properties>
+						<abackground value="Cr:122,207,245,255"/>
+						<aforeground value="Cr:0,0,0,255"/>
+						<azOrder value="-1"/>
+						<aselectable value="true"/>
+						<arequestResetCaption value="false"/>
+						<arequestResetCaptionSize value="false"/>
+						<aconnectorStyle value="3"/>
+						<aconnectorLineJumps value="4"/>
+						<aconnectorLabelOrientation value="4"/>
+						<afromShapeXDiff value="0"/>
+						<afromShapeYDiff value="0"/>
+						<atoShapeXDiff value="0"/>
+						<atoShapeYDiff value="0"/>
+						<afromConnectType value="0"/>
+						<atoConnectType value="0"/>
+						<auseFromShapeCenter value="true"/>
+						<auseToShapeCenter value="true"/>
+						<afromPinType value="1"/>
+						<atoPinType value="1"/>
+						<arequestRebuild value="false"/>
+						<ashowConnectorName value="2"/>
+						<apaintThroughLabel value="2"/>
+					</properties>
+				</xmi:Extension>
+				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
+				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
+			</uml:DiagramElement>
+			<uml:DiagramElement geometry="469,180;300,180;" preferredShapeType="Association" subject="QjBybuyCiu1SNxGg" xmi:id="QjBybuyCiu1SNxGl">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<captionBounds value="355,180,20,0"/>
+					<captionInternalWidth value="-2147483648"/>
+					<captionInternalHeight value="-2147483648"/>
+					<captionVisible value="true"/>
+					<captionSide value="1"/>
+					<properties>
+						<abackground value="Cr:122,207,245,255"/>
+						<aforeground value="Cr:0,0,0,255"/>
+						<azOrder value="-1"/>
+						<acreatorDiagramType value="ClassDiagram"/>
+						<aselectable value="true"/>
+						<arequestResetCaption value="false"/>
+						<arequestResetCaptionSize value="false"/>
+						<aconnectorStyle value="3"/>
+						<aconnectorLineJumps value="4"/>
+						<aconnectorLabelOrientation value="4"/>
+						<afromShapeXDiff value="0"/>
+						<afromShapeYDiff value="0"/>
+						<atoShapeXDiff value="0"/>
+						<atoShapeYDiff value="0"/>
+						<afromConnectType value="0"/>
+						<atoConnectType value="0"/>
+						<auseFromShapeCenter value="true"/>
+						<auseToShapeCenter value="true"/>
+						<afromPinType value="1"/>
+						<atoPinType value="1"/>
+						<arequestRebuild value="false"/>
+						<ashowConnectorName value="2"/>
+						<apaintThroughLabel value="2"/>
+						<ahasRoleAShape value="false"/>
+						<ahasRoleBShape value="false"/>
+						<ashowMultiplicityConstraints value="false"/>
+						<ahasMultiplicityAShape value="false"/>
+						<ahasMultiplicityBShape value="false"/>
+						<a0SwDr value="false"/>
+						<ashowStereotypes value="true"/>
+						<ashowFromRoleName value="true"/>
+						<ashowToRoleName value="true"/>
+						<ashowFromMultiplicity value="true"/>
+						<ashowToMultiplicity value="true"/>
+						<ashowFromRoleVisibility value="true"/>
+						<ashowToRoleVisibility value="true"/>
+						<ashowAssociationEndPropertyStrings value="false"/>
+						<ahasAssociationEndPropertyStringsAShape value="false"/>
+						<ahasAssociationEndPropertyStringsBShape value="false"/>
+						<afromRoleInternalWidth value="-2147483648"/>
+						<afromRoleInternalHeight value="-2147483648"/>
+						<atoRoleInternalWidth value="-2147483648"/>
+						<atoRoleInternalHeight value="-2147483648"/>
+						<afromMultiplicityInternalWidth value="-2147483648"/>
+						<afromMultiplicityInternalHeight value="-2147483648"/>
+						<atoMultiplicityInternalWidth value="-2147483648"/>
+						<atoMultiplicityInternalHeight value="-2147483648"/>
+						<aassociationEndPropertyStringsAInternalWidth value="-2147483648"/>
+						<aassociationEndPropertyStringsAInternalHeight value="-2147483648"/>
+						<aassociationEndPropertyStringsBInternalWidth value="-2147483648"/>
+						<aassociationEndPropertyStringsBInternalHeight value="-2147483648"/>
+					</properties>
+				</xmi:Extension>
+				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
+				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
+			</uml:DiagramElement>
+			<uml:DiagramElement geometry="770,80;770,160;830,160;830,60;810,60;" preferredShapeType="Association" subject="m4aBHuyCiu1SNxLY" xmi:id="m4aBHuyCiu1SNxLd">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<captionBounds value="810,170,63,14"/>
+					<captionInternalWidth value="-2147483648"/>
+					<captionInternalHeight value="-2147483648"/>
+					<captionVisible value="true"/>
+					<captionSide value="1"/>
+					<properties>
+						<abackground value="Cr:122,207,245,255"/>
+						<aforeground value="Cr:0,0,0,255"/>
+						<azOrder value="-1"/>
+						<acreatorDiagramType value="ClassDiagram"/>
+						<aselectable value="true"/>
+						<arequestResetCaption value="false"/>
+						<arequestResetCaptionSize value="false"/>
+						<aconnectorStyle value="3"/>
+						<aconnectorLineJumps value="4"/>
+						<aconnectorLabelOrientation value="4"/>
+						<afromShapeXDiff value="0"/>
+						<afromShapeYDiff value="0"/>
+						<atoShapeXDiff value="0"/>
+						<atoShapeYDiff value="0"/>
+						<afromConnectType value="0"/>
+						<atoConnectType value="0"/>
+						<auseFromShapeCenter value="true"/>
+						<auseToShapeCenter value="true"/>
+						<afromPinType value="1"/>
+						<atoPinType value="1"/>
+						<arequestRebuild value="false"/>
+						<ashowConnectorName value="2"/>
+						<apaintThroughLabel value="2"/>
+						<ahasRoleAShape value="false"/>
+						<ahasRoleBShape value="false"/>
+						<ashowMultiplicityConstraints value="false"/>
+						<ahasMultiplicityAShape value="false"/>
+						<ahasMultiplicityBShape value="false"/>
+						<a0SwDr value="false"/>
+						<ashowStereotypes value="true"/>
+						<ashowFromRoleName value="true"/>
+						<ashowToRoleName value="true"/>
+						<ashowFromMultiplicity value="true"/>
+						<ashowToMultiplicity value="true"/>
+						<ashowFromRoleVisibility value="true"/>
+						<ashowToRoleVisibility value="true"/>
+						<ashowAssociationEndPropertyStrings value="false"/>
+						<ahasAssociationEndPropertyStringsAShape value="false"/>
+						<ahasAssociationEndPropertyStringsBShape value="false"/>
+						<afromRoleInternalWidth value="-2147483648"/>
+						<afromRoleInternalHeight value="-2147483648"/>
+						<atoRoleInternalWidth value="-2147483648"/>
+						<atoRoleInternalHeight value="-2147483648"/>
+						<afromMultiplicityInternalWidth value="-2147483648"/>
+						<afromMultiplicityInternalHeight value="-2147483648"/>
+						<atoMultiplicityInternalWidth value="-2147483648"/>
+						<atoMultiplicityInternalHeight value="-2147483648"/>
+						<aassociationEndPropertyStringsAInternalWidth value="-2147483648"/>
+						<aassociationEndPropertyStringsAInternalHeight value="-2147483648"/>
+						<aassociationEndPropertyStringsBInternalWidth value="-2147483648"/>
+						<aassociationEndPropertyStringsBInternalHeight value="-2147483648"/>
+					</properties>
+				</xmi:Extension>
+				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
+				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
+			</uml:DiagramElement>
+			<uml:DiagramElement geometry="470,340,80,50" preferredShapeType="Class" subject="Oa6BHuyCiu1SNxLh" xmi:id="Oa6BHuyCiu1SNxLg">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<captionBounds value="0,0,80,14"/>
+					<captionInternalWidth value="-2147483648"/>
+					<captionInternalHeight value="-2147483648"/>
+					<captionVisible value="true"/>
+					<captionSide value="12"/>
+					<properties>
+						<abackground value="Cr:192,192,192,255"/>
+						<aforeground value="Cr:0,0,0,255"/>
+						<azOrder value="2"/>
+						<acreatorDiagramType value="ClassDiagram"/>
+						<aselectable value="true"/>
+						<arequestResetCaption value="false"/>
+						<arequestResetCaptionSize value="false"/>
+						<adisplayStereotypeIcon value="false"/>
+						<aoverrideAppearanceWithStereotypeIcon value="true"/>
+						<arequestSetSizeOption value="0"/>
+						<aparentConnectorHeaderLength value="40"/>
+						<aparentConnectorLineLength value="10"/>
+						<aconnectToPoint value="true"/>
+						<aparentConnectorDTheta value="0.0"/>
+						<aconnectionPointType value="2"/>
+						<amodelElementNameAlignment value="9"/>
+						<arequestDefaultSize value="false"/>
+						<arequestFitSize value="false"/>
+						<arequestFitSizeFromCenter value="false"/>
+						<adisplayAsRobustnessAnalysisIcon value="true"/>
+						<avisibilityStyle value="1"/>
+						<ashowAttributeType value="1"/>
+						<ashowOperationType value="1"/>
+						<amSwTpPts value="true"/>
+						<alshRfAts value="true"/>
+						<amShDrAt value="false"/>
+						<akShDrOp value="false"/>
+						<akSwCsMbSt value="true"/>
+						<ashowClassMemberConstraints value="true"/>
+						<alShCmMl value="false"/>
+						<ashowOperationParameterDirection value="false"/>
+						<ashowOperationRaisedExceptions value="false"/>
+						<ashowParameterNameInOperationSignature value="true"/>
+						<ashowOperationTemplateParameters value="false"/>
+						<ashowOperationProperties value="false"/>
+						<awpMbs value="false"/>
+						<aattributeSortType value="0"/>
+						<aoperationSortType value="0"/>
+						<ashowInitialAttributeValue value="true"/>
+						<ashowOperationSignature value="true"/>
+						<ainterfaceBall value="false"/>
+						<ashowEmptyCompartments value="0"/>
+						<ashowEllipsisForUnshownMembers value="0"/>
+						<ashowAttributesCodeDetails value="0"/>
+						<ashowOperationsCodeDetails value="0"/>
+						<ashowParametersCodeDetails value="0"/>
+						<ashowTypeOption value="0"/>
+						<ashowOwnerOption value="3"/>
+						<ashowAttributesType value="0"/>
+						<ashowOperationsParameters value="0"/>
+						<ashowOperationsReturnType value="0"/>
+					</properties>
+				</xmi:Extension>
+				<elementFill color1="Cr:192,192,192,255" color2="" style="1" transparency="0" type="1"/>
+				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
+				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
+			</uml:DiagramElement>
+			<uml:DiagramElement geometry="810,160;810,360;550,360;" preferredShapeType="AssociationClass" subject="Lu.BHuyCiu1SNxLr" xmi:id="ru.BHuyCiu1SNxLs">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<captionBounds value="809,381,20,0"/>
+					<captionInternalWidth value="-2147483648"/>
+					<captionInternalHeight value="-2147483648"/>
+					<captionVisible value="true"/>
+					<captionSide value="1"/>
+					<properties>
+						<abackground value="Cr:122,207,245,255"/>
+						<aforeground value="Cr:0,0,0,255"/>
+						<azOrder value="-1"/>
+						<aselectable value="true"/>
+						<arequestResetCaption value="false"/>
+						<arequestResetCaptionSize value="false"/>
+						<aconnectorStyle value="3"/>
+						<aconnectorLineJumps value="4"/>
+						<aconnectorLabelOrientation value="4"/>
+						<afromShapeXDiff value="0"/>
+						<afromShapeYDiff value="0"/>
+						<atoShapeXDiff value="0"/>
+						<atoShapeYDiff value="0"/>
+						<afromConnectType value="0"/>
+						<atoConnectType value="0"/>
+						<auseFromShapeCenter value="true"/>
+						<auseToShapeCenter value="true"/>
+						<afromPinType value="1"/>
+						<atoPinType value="1"/>
+						<arequestRebuild value="false"/>
+						<ashowConnectorName value="2"/>
+						<apaintThroughLabel value="2"/>
+					</properties>
+				</xmi:Extension>
+				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
+				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
+			</uml:DiagramElement>
+			<uml:DiagramElement geometry="469,360;140,360;140,80;" preferredShapeType="Association" subject="ghXBHuyCiu1SNxMM" xmi:id="IhXBHuyCiu1SNxMR">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<captionBounds value="134,359,20,0"/>
+					<captionInternalWidth value="-2147483648"/>
+					<captionInternalHeight value="-2147483648"/>
+					<captionVisible value="true"/>
+					<captionSide value="1"/>
+					<properties>
+						<abackground value="Cr:122,207,245,255"/>
+						<aforeground value="Cr:0,0,0,255"/>
+						<azOrder value="-1"/>
+						<acreatorDiagramType value="ClassDiagram"/>
+						<aselectable value="true"/>
+						<arequestResetCaption value="false"/>
+						<arequestResetCaptionSize value="false"/>
+						<aconnectorStyle value="3"/>
+						<aconnectorLineJumps value="4"/>
+						<aconnectorLabelOrientation value="4"/>
+						<afromShapeXDiff value="0"/>
+						<afromShapeYDiff value="0"/>
+						<atoShapeXDiff value="0"/>
+						<atoShapeYDiff value="0"/>
+						<afromConnectType value="0"/>
+						<atoConnectType value="0"/>
+						<auseFromShapeCenter value="true"/>
+						<auseToShapeCenter value="true"/>
+						<afromPinType value="1"/>
+						<atoPinType value="1"/>
+						<arequestRebuild value="false"/>
+						<ashowConnectorName value="2"/>
+						<apaintThroughLabel value="2"/>
+						<ahasRoleAShape value="false"/>
+						<ahasRoleBShape value="false"/>
+						<ashowMultiplicityConstraints value="false"/>
+						<ahasMultiplicityAShape value="false"/>
+						<ahasMultiplicityBShape value="false"/>
+						<a0SwDr value="false"/>
+						<ashowStereotypes value="true"/>
+						<ashowFromRoleName value="true"/>
+						<ashowToRoleName value="true"/>
+						<ashowFromMultiplicity value="true"/>
+						<ashowToMultiplicity value="true"/>
+						<ashowFromRoleVisibility value="true"/>
+						<ashowToRoleVisibility value="true"/>
+						<ashowAssociationEndPropertyStrings value="false"/>
+						<ahasAssociationEndPropertyStringsAShape value="false"/>
+						<ahasAssociationEndPropertyStringsBShape value="false"/>
+						<afromRoleInternalWidth value="-2147483648"/>
+						<afromRoleInternalHeight value="-2147483648"/>
+						<atoRoleInternalWidth value="-2147483648"/>
+						<atoRoleInternalHeight value="-2147483648"/>
+						<afromMultiplicityInternalWidth value="-2147483648"/>
+						<afromMultiplicityInternalHeight value="-2147483648"/>
+						<atoMultiplicityInternalWidth value="-2147483648"/>
+						<atoMultiplicityInternalHeight value="-2147483648"/>
+						<aassociationEndPropertyStringsAInternalWidth value="-2147483648"/>
+						<aassociationEndPropertyStringsAInternalHeight value="-2147483648"/>
+						<aassociationEndPropertyStringsBInternalWidth value="-2147483648"/>
+						<aassociationEndPropertyStringsBInternalHeight value="-2147483648"/>
+					</properties>
+				</xmi:Extension>
+				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
+				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
+			</uml:DiagramElement>
+			<uml:DiagramElement geometry="260,200;260,230;750,230;750,80;" preferredShapeType="Association" subject="SA4hHuyCiu1SNxMa" xmi:id="KA4hHuyCiu1SNxMf">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<captionBounds value="290,230,77,14"/>
+					<captionInternalWidth value="-2147483648"/>
+					<captionInternalHeight value="-2147483648"/>
+					<captionVisible value="true"/>
+					<captionSide value="1"/>
+					<properties>
+						<abackground value="Cr:122,207,245,255"/>
+						<aforeground value="Cr:0,0,0,255"/>
+						<azOrder value="-1"/>
+						<acreatorDiagramType value="ClassDiagram"/>
+						<aselectable value="true"/>
+						<arequestResetCaption value="false"/>
+						<arequestResetCaptionSize value="false"/>
+						<aconnectorStyle value="3"/>
+						<aconnectorLineJumps value="4"/>
+						<aconnectorLabelOrientation value="4"/>
+						<afromShapeXDiff value="0"/>
+						<afromShapeYDiff value="0"/>
+						<atoShapeXDiff value="0"/>
+						<atoShapeYDiff value="0"/>
+						<afromConnectType value="0"/>
+						<atoConnectType value="0"/>
+						<auseFromShapeCenter value="true"/>
+						<auseToShapeCenter value="true"/>
+						<afromPinType value="1"/>
+						<atoPinType value="1"/>
+						<arequestRebuild value="false"/>
+						<ashowConnectorName value="2"/>
+						<apaintThroughLabel value="2"/>
+						<ahasRoleAShape value="false"/>
+						<ahasRoleBShape value="false"/>
+						<ashowMultiplicityConstraints value="false"/>
+						<ahasMultiplicityAShape value="false"/>
+						<ahasMultiplicityBShape value="false"/>
+						<a0SwDr value="false"/>
+						<ashowStereotypes value="true"/>
+						<ashowFromRoleName value="true"/>
+						<ashowToRoleName value="true"/>
+						<ashowFromMultiplicity value="true"/>
+						<ashowToMultiplicity value="true"/>
+						<ashowFromRoleVisibility value="true"/>
+						<ashowToRoleVisibility value="true"/>
+						<ashowAssociationEndPropertyStrings value="false"/>
+						<ahasAssociationEndPropertyStringsAShape value="false"/>
+						<ahasAssociationEndPropertyStringsBShape value="false"/>
+						<afromRoleInternalWidth value="-2147483648"/>
+						<afromRoleInternalHeight value="-2147483648"/>
+						<atoRoleInternalWidth value="-2147483648"/>
+						<atoRoleInternalHeight value="-2147483648"/>
+						<afromMultiplicityInternalWidth value="-2147483648"/>
+						<afromMultiplicityInternalHeight value="-2147483648"/>
+						<atoMultiplicityInternalWidth value="-2147483648"/>
+						<atoMultiplicityInternalHeight value="-2147483648"/>
+						<aassociationEndPropertyStringsAInternalWidth value="-2147483648"/>
+						<aassociationEndPropertyStringsAInternalHeight value="-2147483648"/>
+						<aassociationEndPropertyStringsBInternalWidth value="-2147483648"/>
+						<aassociationEndPropertyStringsBInternalHeight value="-2147483648"/>
+					</properties>
+				</xmi:Extension>
+				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
+				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
+			</uml:DiagramElement>
+			<uml:DiagramElement geometry="470,260,80,50" preferredShapeType="Class" subject="ThihHuyCiu1SNxMu" xmi:id="ThihHuyCiu1SNxMt">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<captionBounds value="0,0,80,14"/>
+					<captionInternalWidth value="-2147483648"/>
+					<captionInternalHeight value="-2147483648"/>
+					<captionVisible value="true"/>
+					<captionSide value="12"/>
+					<properties>
+						<abackground value="Cr:192,192,192,255"/>
+						<aforeground value="Cr:0,0,0,255"/>
+						<azOrder value="0"/>
+						<acreatorDiagramType value="ClassDiagram"/>
+						<aselectable value="true"/>
+						<arequestResetCaption value="false"/>
+						<arequestResetCaptionSize value="false"/>
+						<adisplayStereotypeIcon value="false"/>
+						<aoverrideAppearanceWithStereotypeIcon value="true"/>
+						<arequestSetSizeOption value="0"/>
+						<aparentConnectorHeaderLength value="40"/>
+						<aparentConnectorLineLength value="10"/>
+						<aconnectToPoint value="true"/>
+						<aparentConnectorDTheta value="0.0"/>
+						<aconnectionPointType value="2"/>
+						<amodelElementNameAlignment value="9"/>
+						<arequestDefaultSize value="false"/>
+						<arequestFitSize value="false"/>
+						<arequestFitSizeFromCenter value="false"/>
+						<adisplayAsRobustnessAnalysisIcon value="true"/>
+						<avisibilityStyle value="1"/>
+						<ashowAttributeType value="1"/>
+						<ashowOperationType value="1"/>
+						<amSwTpPts value="true"/>
+						<alshRfAts value="true"/>
+						<amShDrAt value="false"/>
+						<akShDrOp value="false"/>
+						<akSwCsMbSt value="true"/>
+						<ashowClassMemberConstraints value="true"/>
+						<alShCmMl value="false"/>
+						<ashowOperationParameterDirection value="false"/>
+						<ashowOperationRaisedExceptions value="false"/>
+						<ashowParameterNameInOperationSignature value="true"/>
+						<ashowOperationTemplateParameters value="false"/>
+						<ashowOperationProperties value="false"/>
+						<awpMbs value="false"/>
+						<aattributeSortType value="0"/>
+						<aoperationSortType value="0"/>
+						<ashowInitialAttributeValue value="true"/>
+						<ashowOperationSignature value="true"/>
+						<ainterfaceBall value="false"/>
+						<ashowEmptyCompartments value="0"/>
+						<ashowEllipsisForUnshownMembers value="0"/>
+						<ashowAttributesCodeDetails value="0"/>
+						<ashowOperationsCodeDetails value="0"/>
+						<ashowParametersCodeDetails value="0"/>
+						<ashowTypeOption value="0"/>
+						<ashowOwnerOption value="3"/>
+						<ashowAttributesType value="0"/>
+						<ashowOperationsParameters value="0"/>
+						<ashowOperationsReturnType value="0"/>
+					</properties>
+				</xmi:Extension>
+				<elementFill color1="Cr:192,192,192,255" color2="" style="1" transparency="0" type="1"/>
+				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
+				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
+			</uml:DiagramElement>
+			<uml:DiagramElement geometry="510,230;510,259;" preferredShapeType="AssociationClass" subject="XpGhHuyCiu1SNxM0" xmi:id="XpGhHuyCiu1SNxM1">
+				<xmi:Extension extender="Visual Paradigm for UML">
+					<captionBounds value="520,264,20,0"/>
+					<captionInternalWidth value="-2147483648"/>
+					<captionInternalHeight value="-2147483648"/>
+					<captionVisible value="true"/>
+					<captionSide value="1"/>
+					<properties>
+						<abackground value="Cr:122,207,245,255"/>
+						<aforeground value="Cr:0,0,0,255"/>
+						<azOrder value="-1"/>
+						<aselectable value="true"/>
+						<arequestResetCaption value="false"/>
+						<arequestResetCaptionSize value="false"/>
+						<aconnectorStyle value="3"/>
+						<aconnectorLineJumps value="4"/>
+						<aconnectorLabelOrientation value="4"/>
+						<afromShapeXDiff value="0"/>
+						<afromShapeYDiff value="0"/>
+						<atoShapeXDiff value="0"/>
+						<atoShapeYDiff value="0"/>
+						<afromConnectType value="0"/>
+						<atoConnectType value="0"/>
+						<auseFromShapeCenter value="true"/>
+						<auseToShapeCenter value="true"/>
+						<afromPinType value="1"/>
+						<atoPinType value="1"/>
+						<arequestRebuild value="false"/>
+						<ashowConnectorName value="2"/>
+						<apaintThroughLabel value="2"/>
+					</properties>
+				</xmi:Extension>
+				<elementFont bold="false" color="Cr:0,0,0,255" italic="false" name="Dialog" size="11" style="0"/>
+				<elementLine color="Cr:0,0,0,255" style="1" transparency="0" weight="1.0"/>
+			</uml:DiagramElement>
+		</uml:Diagram.element>
+	</uml:Diagram>
+	<uml:Diagram diagramType="PackageDiagram" documentation="" name="Package Diagram1" toolName="Visual Paradigm for UML" xmi:id="gxe0buyCiu1SNw.m">
+		<xmi:Extension extender="Visual Paradigm for UML">
+			<properties>
+				<apmAuthor value="lavm"/>
+				<apmCreateDateTime value="1337717549249"/>
+				<apmLastModified value="1337805933734"/>
+				<ashowPackageNameStyle value="0"/>
+				<ashowConnectorName value="0"/>
+				<apaintConnectorThroughLabel value="0"/>
+				<ashowActivityStateNodeCaption value="65535"/>
+				<aeditable value="true"/>
+				<afollowDiagramParentElement value="true"/>
+				<aautoFitShapesSize value="false"/>
+				<ashowTaggedValues value="false"/>
+				<ashowStereotypes value="true"/>
+				<ashowConstraints value="false"/>
+				<aalignToGrid value="true"/>
+				<agridVisible value="false"/>
+				<agridWidth value="10"/>
+				<agridHeight value="10"/>
+				<agridColor value="Cr:192,192,192,255"/>
+				<adiagramBackground value="Cr:255,255,255,255"/>
+				<aconnectorStyle value="1"/>
+				<aconnectorLineJumps value="0"/>
+				<aconnectorLineJumpsSize value="0"/>
+				<aconnectionPointStyle value="0"/>
+				<aconnectorLabelOrientation value="0"/>
+				<amodelElementNameAlignment value="4"/>
+				<azoomRatio value="1.0"/>
+				<amaximized value="false"/>
+				<ax value="0"/>
+				<ay value="0"/>
+				<awidth value="1235"/>
+				<aheight value="708"/>
+				<aqualityScore value="-1"/>
+				<a_globalPaletteOption value="true"/>
+				<a_alwaysShowReferenceAndSubdiagramResource value="false"/>
+				<ainitializeDiagramForCreate value="true"/>
+				<arequestValidateSnapToGrid value="false"/>
+				<ashowDefaultPackage value="true"/>
+			</properties>
+		</xmi:Extension>
+	</uml:Diagram>
 </xmi:XMI>
\ No newline at end of file
--- a/primer/Primer.html	Thu May 24 21:48:41 2012 -0400
+++ b/primer/Primer.html	Thu May 24 21:51:11 2012 -0400
@@ -13,6 +13,7 @@
    .note { font-size:small; margin-left:50px }
   </style>
 
+  <script src="http://www.w3.org/2007/OWL/toggles.js" class="remove"></script> 
   <script src="http://dev.w3.org/2009/dap/ReSpec.js/js/respec.js" class="remove"></script>
 
   <script class="remove">
@@ -155,30 +156,30 @@
    environments such as the Web. This document is an
    intuitive introduction and guide with simple illustrative examples
    of the core aspects of PROV.
-      
-      <h4>PROV Family of Specifications</h4>
-The PROV family of specifications aims to define the various aspects that are necessary to achieve the vision of inter-operable
-interchange of provenance information in heterogeneous environments such as the Web.  
-The specifications are as follows.
-<ul>
-<li> PROV-PRIMER, a primer for the PROV data model (this document),</li>
-<li> PROV-DM, the PROV data model for provenance,</li>
-<li> PROV-DM-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 OWL-RL ontology allowing the mapping of PROV to RDF;</li>
-<li> PROV-AQ, the mechanisms for accessing and querying provenance; </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>
-</ul>
-<h4>How to read the PROV Family of Specifications</h4>
-<ul>
-<li>The primer is the entry point to PROV offering a pedagogical presentation of 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 OWL-RL ontology. For further details, PROV-DM and PROV-DM-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-DM. Further details can also be found in PROV-DM, PROV-DM-CONSTRAINTS, and PROV-SEM.</li>
-<li>Developers seeking to retrieve or publish provenance should focus of PROV-AQ.</li>
-<li>Readers seeking to implement other PROV serializations
-should focus on PROV-DM and PROV-DM-CONSTRAINTS.  PROV-O, PROV-N, PROV-XML offer examples of mapping to RDF, text, and XML, respectively.</li>
-</ul>
+
+   <h4>PROV Family of Specifications</h4>
+   The PROV family of specifications aims to define the various aspects that are necessary to achieve the vision of inter-operable
+   interchange of provenance information in heterogeneous environments such as the Web.  
+   The specifications are as follows.
+   <ul>
+    <li> PROV-PRIMER, a primer for the PROV data model (this document),</li>
+    <li> PROV-DM, the PROV data model for provenance,</li>
+    <li> PROV-DM-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 OWL-RL ontology allowing the mapping of PROV to RDF;</li>
+    <li> PROV-AQ, the mechanisms for accessing and querying provenance; </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>
+   </ul>
+   <h4>How to read the PROV Family of Specifications</h4>
+   <ul>
+    <li>The primer is the entry point to PROV offering a pedagogical presentation of 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 OWL-RL ontology. For further details, PROV-DM and PROV-DM-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-DM. Further details can also be found in PROV-DM, PROV-DM-CONSTRAINTS, and PROV-SEM.</li>
+    <li>Developers seeking to retrieve or publish provenance should focus of PROV-AQ.</li>
+    <li>Readers seeking to implement other PROV serializations
+     should focus on PROV-DM and PROV-DM-CONSTRAINTS.  PROV-O, PROV-N, PROV-XML offer examples of mapping to RDF, text, and XML, respectively.</li>
+   </ul>
 
 
   </section>
@@ -225,8 +226,8 @@
     Provenance records are metadata.  There are other kinds of metadata that is 
     not provenance.  For example, the size of an image is metadata of 
     that image but it is not provenance.
-    </p>
-    
+   </p>
+
    <p>
     For general background on provenance, a 
     comprehensive overview of requirements, use cases, prior research, and proposed 
@@ -236,25 +237,25 @@
     that may help identify the provenance aspects of planned applications and 
     help plan the design of a provenance system.
    </p>
-   
+
    <p>
     This primer document aims to ease the adoption of the PROV specifications by providing:
    </p>
    <ul>
     <li>An intuitive explanation of how PROV models provenance. A detailed description of
-    all the concepts and relations in the PROV Data Model is provided in [[PROV-DM]].</li>
+     all the concepts and relations in the PROV Data Model is provided in [[PROV-DM]].</li>
     <li>A simple self-contained example that illustrates how to produce and use PROV assertions, highlighting how 
-    to combine PROV with other popular vocabularies such as FOAF and Dublin Core.  A description
-    of the formal PROV ontology (PROV-O) can be found in [[PROV-O]].</li>
+     to combine PROV with other popular vocabularies such as FOAF and Dublin Core.  A description
+     of the formal PROV ontology (PROV-O) can be found in [[PROV-O]].</li>
     <li>Example snippets using a notation of PROV designed for human
-    consumption (PROV-N).  Details of this notation can be found at [[PROV-N]].</li>
+     consumption (PROV-N).  Details of this notation can be found at [[PROV-N]].</li>
    </ul>
-   
+
    <p>There are additional reference documents for PROV that are not covered in this 
-   primer, including the PROV Access and Query aspects of the specification (PROV-AQ), 
-   the constraints on the PROV data model (PROV-DM-CONSTRAINTS), 
-   a formal semantics of the PROV data model (PROV-SEM), and the PROV XML notation 
-   (PROV-XML). </p>
+    primer, including the PROV Access and Query aspects of the specification (PROV-AQ), 
+    the constraints on the PROV data model (PROV-DM-CONSTRAINTS), 
+    a formal semantics of the PROV data model (PROV-SEM), and the PROV XML notation 
+    (PROV-XML). </p>
 
   </section>
 
@@ -275,7 +276,7 @@
     PROV relations are named so they can be used in assertions about the past.  
     This also affects the domain and range of the relations in PROV.  
    </p>
-  
+
    <div style="text-align: center;">
     <img src="OverviewDiagram.png" alt="PROV-DM overview"/>
    </div>
@@ -355,10 +356,10 @@
      the entity.
     </p>
     <p>
-    One may want to describe the provenance of an agent.  For example, an organization 
-    responsible for the creation of a report may evolve over time as the report is written as
-    some members leave and others join.  To make provenance assertions about an agent in PROV ,
-    the agent must be declared explicitly both as an agent and as an entity.
+     One may want to describe the provenance of an agent.  For example, an organization 
+     responsible for the creation of a report may evolve over time as the report is written as
+     some members leave and others join.  To make provenance assertions about an agent in PROV ,
+     the agent must be declared explicitly both as an agent and as an entity.
     </p>
 
    </section>
@@ -432,21 +433,21 @@
     </p>
     <ul>
      <li>The same entity can appear with different descriptions in a provenance record
-     because each appearance emphasizes different aspects of the entity, e.g.
-     a book may be described by its title in one place and by its author and publication date
-     in another.</li>
+      because each appearance emphasizes different aspects of the entity, e.g.
+      a book may be described by its title in one place and by its author and publication date
+      in another.</li>
      <li>The same entity can evolve over time into different 
-     versions, e.g. a document that is repeatedly updated and has 
-     subsequent releases over time.</li>
+      versions, e.g. a document that is repeatedly updated and has 
+      subsequent releases over time.</li>
      <li>The same entity can be copied 
-     or replicated, e.g. a document may be copied to several directories.</li>
+      or replicated, e.g. a document may be copied to several directories.</li>
      <li>An entity can go through different incarnations, e.g.
-     a committee producing a report may have a set of members when the report 
-     is first released and have a different set of members when an update of
-     the report is released.</li>
+      a committee producing a report may have a set of members when the report 
+      is first released and have a different set of members when an update of
+      the report is released.</li>
     </ul>
     <p>
-       In all these situations, 
+     In all these situations, 
      the more specific entities (the versions, copies, incarnations) can be said in PROV to be <i>specializations</i>
      of the more general entity (the book, the document or the committee as a general entity).
      The specific entities in each example are also <i>alternates</i> of each other, as they are specializations
@@ -465,6 +466,34 @@
   <section>
    <h2>Examples of Key Concepts in PROV</h2>
 
+   <form action="#"><p> 
+     <input id="hide-turtle-examples" type="button" value="Hide Turtle Examples" 
+            onclick="
+             set_display_by_class('pre','turtle example','none');
+             set_display_by_class('div','turtle example','none');
+             set_display_by_id('hide-turtle-examples','none');
+             set_display_by_id('show-turtle-examples','');" />
+     <input id="show-turtle-examples" type="button" value="Show Turtle Examples"
+            style="display:none" onclick="
+             set_display_by_class('pre','turtle example','');
+             set_display_by_class('div','turtle example','');
+             set_display_by_id('hide-turtle-examples','');
+             set_display_by_id('show-turtle-examples','none');" />
+     <input id="hide-provn-examples" type="button" value="Hide PROV-N Examples"
+            style="display:none" onclick="
+             set_display_by_class('pre','provn example','none');
+             set_display_by_class('div','provn example','none');
+             set_display_by_id('hide-provn-examples','none');
+             set_display_by_id('show-provn-examples','');" />
+     <input id="show-provn-examples" type="button" value="Show PROV-N Examples" 
+            onclick="
+             set_display_by_class('pre','provn example','');
+             set_display_by_class('div','provn example','');
+             set_display_by_id('hide-provn-examples','');
+             set_display_by_id('show-provn-examples','none');" />
+    </p> 
+   </form>
+
    <p>
     In the following sections, we show how PROV can be used to model 
     provenance in a specific example scenario.
@@ -497,14 +526,29 @@
      Betty retrieves a record of the provenance of the article, describing how it was created.
     </p>
     <p>Betty finds the following descriptions of entities in the provenance:</p>
-    <pre class="turtle example">
-     ex:article     a prov:Entity ;
-                    dcterms:title "Crime rises in cities" .
-     ex:dataset1    a prov:Entity .
-     ex:regionList  a prov:Entity .
-     ex:composition a prov:Entity .
-     ex:chart1      a prov:Entity .
-    </pre>
+    <div class="turtle example">
+     <div class="exampleheader">
+      <span class="exampleheader"><b>Turtle Example</b></span></div>
+     <pre>
+  ex:article     a prov:Entity ;
+                 dcterms:title "Crime rises in cities" .
+  ex:dataset1    a prov:Entity .
+  ex:regionList  a prov:Entity .
+  ex:composition a prov:Entity .
+  ex:chart1      a prov:Entity .
+     </pre>
+    </div>
+    <div class="provn example" style="display:none">
+     <div class="exampleheader">
+      <span class="exampleheader"><b>PROV-N Example</b></span></div>
+     <pre>
+  entity(ex:article, [dcterms:title="Crime rises in cities"])
+  entity(ex:dataSet1)
+  entity(ex:regionList)
+  entity(ex:composition)
+  entity(ex:chart1)
+     </pre>
+    </div>
     <p>
      These statements, in order, refer to the article (<code>ex:article</code>),
      an original data set (<code>ex:dataSet1</code>),
@@ -530,18 +574,35 @@
      an activity (<code>ex:compile</code>) denoting the compilation of the
      chart from the data set.
     </p>
-    <pre class="turtle example">
-     ex:compile a prov:Activity .
-    </pre>
+    <div class="turtle example">
+     <div class="exampleheader">
+      <span class="exampleheader"><b>Turtle Example</b></span></div>
+     <pre>
+  ex:compile a prov:Activity .
+     </pre>
+    </div>
     <p>
      The provenance also includes reference to the more specific steps involved in this compilation,
      which are first composing the data by region (<code>ex:compose</code>) and then generating the
      chart graphic (<code>ex:illustrate</code>).
     </p>
-    <pre class="turtle example">
+    <div class="turtle example">
+     <div class="exampleheader">
+      <span class="exampleheader"><b>Turtle Example</b></span></div>
+     <pre>
      ex:compose    a prov:Activity .
      ex:illustrate a prov:Activity .
-    </pre>
+     </pre>
+    </div>
+    <div class="provn example" style="display:none">
+     <div class="exampleheader">
+      <span class="exampleheader"><b>PROV-N Example</b></span></div>
+     <pre>
+     activity(ex:compile)
+     activity(ex:compose)
+     activity(ex:illustrate)
+     </pre>
+    </div>
     <p>
      In visualizations of the PROV data, activities are depicted as rectangles, as below.
     </p>
@@ -562,19 +623,39 @@
      (<code>ex:compose</code>) used the original data set, that it used the list of
      regions, and that the composed data was generated by this activity.
     </p>
-    <pre class="turtle example">
+    <div class="turtle example">
+     <div class="exampleheader">
+      <span class="exampleheader"><b>Turtle Example</b></span></div>
+     <pre>
      ex:compose      prov:used           ex:dataSet1 ;
                      prov:used           ex:regionList .
      ex:composition  prov:wasGeneratedBy ex:compose .
-    </pre>
+     </pre>
+    </div>
     <p>
      Similarly, the chart graphic creation activity (<code>ex:illustrate</code>)
      used the composed data, and the chart was generated by this activity.
     </p>
-    <pre class="turtle example">
+    <div class="turtle example">
+     <div class="exampleheader">
+      <span class="exampleheader"><b>Turtle Example</b></span></div>
+     <pre>
      ex:illustrate prov:used           ex:composition .
      ex:chart1     prov:wasGeneratedBy ex:illustrate .
-    </pre>
+     </pre>
+    </div>
+    <div class="provn example" style="display:none">
+     <div class="exampleheader">
+      <span class="exampleheader"><b>PROV-N Example</b></span></div>
+     <pre>
+     used(ex:compose, ex:dataSet1, -)
+     used(ex:compose, ex:regionList, -)
+     wasGeneratedBy(ex:composition, ex:compose, -)
+
+     used(ex:illustrate, ex:composition, -)
+     wasGeneratedBy(ex:chart1, ex:illustrate, -)
+     </pre>
+    </div>
     <p>
      In visualizing the PROV data, usage and generation are connections between
      entities and activities.
@@ -590,40 +671,89 @@
      Betty sees that Derek was involved in both the composition and
      chart creation activities:
     </p>
-    <pre class="turtle example">
+    <div class="turtle example">
+     <div class="exampleheader">
+      <span class="exampleheader"><b>Turtle Example</b></span></div>
+     <pre>
      ex:compose    prov:wasAssociatedWith ex:derek .
      ex:illustrate prov:wasAssociatedWith ex:derek .
-    </pre>
+     </pre>
+    </div>
+    <div class="provn example" style="display:none">
+     <div class="exampleheader">
+      <span class="exampleheader"><b>PROV-N Example</b></span></div>
+     <pre>
+     wasAssociatedWith(ex:compose, ex:derek, -)
+     wasAssociatedWith(ex:illustrate, ex:derek, -)
+     </pre>
+    </div>
     <p>
      The record for Derek provides the
      following information, of which the first lines are PROV-O statements that
      Derek is an agent, specifically a person, followed by (non-PROV) statements
      giving general properties of Derek.
     </p>
-    <pre class="turtle example">
+    <div class="turtle example">
+     <div class="exampleheader">
+      <span class="exampleheader"><b>Turtle Example</b></span></div>
+     <pre>
      ex:derek a prov:Agent ;
               a prov:Person ;
               foaf:givenName "Derek"^^xsd:string ;
               foaf:mbox      &lt;mailto:derek@example.org&gt; .
-    </pre>
+     </pre>
+    </div>
+    <div class="provn example" style="display:none">
+     <div class="exampleheader">
+      <span class="exampleheader"><b>PROV-N Example</b></span></div>
+     <pre>
+     agent(ex:derek, [ prov:type="prov:Person", foaf:givenName = "Derek", 
+            foaf:mbox= "&lt;mailto:derek@example.org&gt;"])
+     </pre>
+    </div>
     <p>
      Derek works as part of an organization, Chart Generators Inc, and so the provenance
      declares that he acts on their behalf. Note that the organization is itself
      an agent.
     </p>
-    <pre class="turtle example">
+    <div class="turtle example">
+     <div class="exampleheader">
+      <span class="exampleheader"><b>Turtle Example</b></span></div>
+     <pre>
      ex:derek prov:actedOnBehalfOf ex:chartgen .
      ex:chartgen a prov:Agent ;
                  a prov:Organization ;
                  foaf:name "Chart Generators Inc" .
-    </pre>
+     </pre>
+    </div>
+    <div class="provn example" style="display:none">
+     <div class="exampleheader">
+      <span class="exampleheader"><b>PROV-N Example</b></span></div>
+     <pre>
+     agent(ex:chartgen, [ prov:type="prov:Organization",
+            foaf:name = "Chart Generators Inc"])
+     actedOnBehalfOf(ex:derek, ex:chartgen, ex:compose)
+     </pre>
+    </div>
     <p>
      Finally, there is an explicit statement in the provenance that the chart was
      attributed to Derek.
     </p>
-    <pre class="turtle example">
+    <div class="turtle example">
+     <div class="exampleheader">
+      <span class="exampleheader"><b>Turtle Example</b></span></div>
+     <pre>
      ex:chart1 prov:wasAttributedTo ex:derek .
-    </pre>
+     </pre>
+    </div>
+    <div class="provn example" style="display:none">
+     <div class="exampleheader">
+      <span class="exampleheader"><b>PROV-N Example</b></span></div>
+     <pre>
+     wasAttributedTo(ex:chart1, ex:derek)
+     </pre>
+    </div>
+
     <p>
      We can extend our graphical depiction to show the agents, association and attribution links.
     </p>
@@ -650,21 +780,29 @@
      resulting composed data (<code>ex:composedData</code>), and the
      analyst doing the composition (<code>ex:analyst</code>).
     </p>
-    <pre class="turtle example">
+    <div class="turtle example">
+     <div class="exampleheader">
+      <span class="exampleheader"><b>Turtle Example</b></span></div>
+     <pre>
      ex:dataToCompose        a prov:Role .
      ex:regionsToAggregateBy a prov:Role .
      ex:composedData         a prov:Role .
      ex:analyst              a prov:Role .
-    </pre>
+     </pre>
+    </div>
     <p>
      Examples in the sections above show descriptions of the simple facts that the
      composition activity used, generated and was enacted by entities/agents.
      For example, the usage of the data set by the compose activity is expressed
      as follows.
     </p>
-    <pre class="turtle example">
+    <div class="turtle example">
+     <div class="exampleheader">
+      <span class="exampleheader"><b>Turtle Example</b></span></div>
+     <pre>
      ex:compose prov:used ex:dataSet1 .
-    </pre>
+     </pre>
+    </div>
     <p>     
      The
      provenance can contain more details of exactly how these entities and agents
@@ -679,31 +817,56 @@
      of the government data set (<code>ex:dataSet1</code>) in the role of the data
      to be composed (<code>ex:dataToCompose</code>).
     </p>
-    <pre class="turtle example">
+    <div class="turtle example">
+     <div class="exampleheader">
+      <span class="exampleheader"><b>Turtle Example</b></span></div>
+     <pre>
      ex:compose prov:qualifiedUsage [
                    a prov:Usage ;
                    prov:entity  ex:dataSet1 ;
                    prov:hadRole ex:dataToCompose 
      ] .
-    </pre>
+     </pre>
+    </div>
+    <div class="provn example" style="display:none">
+     <div class="exampleheader">
+      <span class="exampleheader"><b>PROV-N Example</b></span></div>
+     <pre>
+     used(ex:compose, ex:dataSet1,   -, [ prov:role = "ex:dataToCompose"])
+     </pre>
+    </div>
     <p>
      This can then be distinguished from the same activity's usage of the list of
      regions because the roles played are different.
     </p>
-    <pre class="turtle example">
+    <div class="turtle example">
+     <div class="exampleheader">
+      <span class="exampleheader"><b>Turtle Example</b></span></div>
+     <pre>
      ex:compose prov:qualifiedUsage [
                    a prov:Usage ;
                    prov:entity  ex:regionList ;
                    prov:hadRole ex:regionsToAggregateBy
      ] .
-    </pre>
+     </pre>
+    </div>
+    <div class="provn example" style="display:none">
+     <div class="exampleheader">
+      <span class="exampleheader"><b>PROV-N Example</b></span></div>
+     <pre>
+     used(ex:compose, ex:regionList, -, [ prov:role = "ex:regionsToAggregateBy"])
+     </pre>
+    </div>
     <p>
      Similarly, the provenance includes descriptions that the same activity was
      enacted in a particular way by Derek, so it indicates that he had the role of 
      <code>ex:analyst</code>, and that the entity <code>ex:composition</code> took the role of the composed
      data in what the activity generated:
     </p>
-    <pre class="turtle example">
+    <div class="turtle example">
+     <div class="exampleheader">
+      <span class="exampleheader"><b>Turtle Example</b></span></div>
+     <pre>
      ex:compose  prov:qualifiedAssociation [
                    a  prov:Association ;
                    prov:agent    ex:derek ;
@@ -714,7 +877,8 @@
                         prov:activity  ex:compose ;
                         prov:hadRole   ex:composedData
      ] .
-    </pre>
+     </pre>
+    </div>
     <p>
      Depicting the above visually, we have the following.
     </p>
@@ -734,26 +898,52 @@
      <code>ex:dataSet2</code>, states that it is a revision of the
      old data set, <code>ex:dataSet1</code>.
     </p>
-    <pre class="turtle example">
+    <div class="turtle example">
+     <div class="exampleheader">
+      <span class="exampleheader"><b>Turtle Example</b></span></div>
+     <pre>
      ex:dataSet2 a prov:Entity ;
                  prov:wasRevisionOf ex:dataSet1 .
-    </pre>
+     </pre>
+    </div>
+    <div class="provn example" style="display:none">
+     <div class="exampleheader">
+      <span class="exampleheader"><b>PROV-N Example</b></span></div>
+     <pre>
+     wasRevisionOf(ex:dataSet2, ex:dataSet1, -)
+     </pre>
+    </div>
     <p>
      Derek notices that there is a new dataset available and creates a new chart based on the revised data, 
      using another compilation activity. Betty checks the article again at a
      later point, and wants to know if it is based on the old or new GovData.
      She sees a new description stating that the new chart is derived from the new dataset.
     </p>
-    <pre class="example turtle">
+    <div class="turtle example">
+     <div class="exampleheader">
+      <span class="exampleheader"><b>Turtle Example</b></span></div>
+     <pre>
      ex:chart2 a prov:Entity ;
                prov:wasDerivedFrom ex:dataSet2 .
-    </pre>
+     </pre>
+    </div>
+    <div class="provn example" style="display:none">
+     <div class="exampleheader">
+      <span class="exampleheader"><b>PROV-N Example</b></span></div>
+     <pre>
+     wasDerivedFrom(ex:chart2, ex:dataSet2)
+     </pre>
+    </div>
     <p>and that the new chart is a revision of the original one:
     </p>
-    <pre class="turtle example">
+    <div class="turtle example">
+     <div class="exampleheader">
+      <span class="exampleheader"><b>Turtle Example</b></span></div>
+     <pre>
      ex:chart2 a prov:Entity ;
                  prov:wasRevisionOf ex:chart1 .
-    </pre>
+     </pre>
+    </div>
     <p>
      Derivation and revision are connections between entities, and so depicted
      with arrows in our visualization.
@@ -772,24 +962,39 @@
      First, the correction activity (<code>ex:correct</code>), the person who corrected
      it, Edith (<code>ex:edith</code>), and the correction instructions (<code>ex:instructions</code>)
      are described.
-    <pre class="turtle example">
+    <div class="turtle example">
+     <div class="exampleheader">
+      <span class="exampleheader"><b>Turtle Example</b></span></div>
+     <pre>
      ex:correct      a prov:Activity .
      ex:edith        a prov:Agent, prov:Person .
      ex:instructions a prov:Plan .
-    </pre>
+     </pre>
+    </div>
     <p>
      The connection between them is expressed in PROV-O using a qualified association giving details of
      how Edith was associated with the correction activity,
      including that she followed the above correction instructions.
     </p>
-    <pre class="turtle example">
+    <div class="turtle example">
+     <div class="exampleheader">
+      <span class="exampleheader"><b>Turtle Example</b></span></div>
+     <pre>
      ex:correct prov:qualifiedAssociation [
                     a Association ;
                     prov:agent   ex:edith ;
                     prov:hadPlan ex:instructions
                 ] .
      ex:dataSet2 prov:wasGeneratedBy ex:correct .
-    </pre>
+     </pre>
+    </div>
+    <div class="provn example" style="display:none">
+     <div class="exampleheader">
+      <span class="exampleheader"><b>PROV-N Example</b></span></div>
+     <pre>
+     wasAssociatedWith(ex:correct, ex:edith, ex:instructions)
+     </pre>
+    </div>
     <p>
      Plans are additional information about the connection from an activity to
      an agent, and so, in our visualization, connect to the link between them.
@@ -808,7 +1013,10 @@
      description of the generation. The snippet below shows that the second chart
      was generated roughly a month after the first.
     </p>
-    <pre class="turtle example">
+    <div class="turtle example">
+     <div class="exampleheader">
+      <span class="exampleheader"><b>Turtle Example</b></span></div>
+     <pre>
      ex:chart1 prov:qualifiedGeneration [
                     a prov:Generation ;
                     prov:activity ex:compile ;
@@ -819,7 +1027,17 @@
                     prov:activity ex:compile2 ;
                     prov:atTime   "2012-04-01T15:21:00"^^xsd:dateTime
      ] .
-    </pre>
+     </pre>
+    </div>
+    <div class="provn example" style="display:none">
+     <div class="exampleheader">
+      <span class="exampleheader"><b>PROV-N Example</b></span></div>
+     <pre>
+     wasGeneratedBy(ex:chart1, ex:compile,  2012-03-02T10:30:00)
+     wasGeneratedBy(ex:chart2, ex:compile2, 2012-04-01T15:21:00)
+     </pre>
+    </div>
+
     <p>
      To ensure their procedures are efficient, the agency also wish to know how long the
      corrections took once the error was discovered. That is, they wish to know the
@@ -827,10 +1045,21 @@
      These details are expressed as follows, showing that the corrections took a
      little over a day.
     </p>
-    <pre class="turtle example">
+    <div class="turtle example">
+     <div class="exampleheader">
+      <span class="exampleheader"><b>Turtle Example</b></span></div>
+     <pre>
      ex:correct prov:startedAtTime "2012-03-31T09:21:00"^^xsd:dateTime ;
                 prov:endedAtTime   "2012-04-01T15:21:00"^^xsd:dateTime .
-    </pre>
+     </pre>
+    </div>
+    <div class="provn example" style="display:none">
+     <div class="exampleheader">
+      <span class="exampleheader"><b>PROV-N Example</b></span></div>
+     <pre>
+     activity(ex:correct, 2012-03-31T09:21:00, 2012-04-01T15:21:00)
+     </pre>
+    </div>
     <p>
      Time is visualized as additional information regarding activities or the
      links between activities and entities or agents.
@@ -846,10 +1075,22 @@
      posted a blog entry about the article. The blog entry had its own published
      provenance, stating that it quoted from the article.
     </p>
-    <pre class="turtle example">
+    <div class="turtle example">
+     <div class="exampleheader">
+      <span class="exampleheader"><b>Turtle Example</b></span></div>
+     <pre>
      ex:blogEntry a prov:Entity ;
                   prov:wasQuotedFrom ex:article .
-    </pre>
+     </pre>
+    </div>
+    <div class="provn example" style="display:none">
+     <div class="exampleheader">
+      <span class="exampleheader"><b>PROV-N Example</b></span></div>
+     <pre>
+     entity(ex:blogEntry)
+     wasQuotedFrom(ex:blogEntry, ex:article)
+     </pre>
+    </div>
     <p>
      The newspaper, from past experience, anticipated that there could be revisions
      to the article, and so created identifiers for both the article in general
@@ -858,9 +1099,24 @@
      In the provenance records, the newspaper describes the connection between the two: that
      the first version of the article is a specialization of the article in general.
     </p>
-    <pre class="turtle example">
+    <div class="turtle example">
+     <div class="exampleheader">
+      <span class="exampleheader"><b>Turtle Example</b></span></div>
+     <pre>
      ex:articleV1 prov:specializationOf ex:article .
-    </pre>
+     </pre>
+    </div>
+    <div class="provn example" style="display:none">
+     <div class="exampleheader">
+      <span class="exampleheader"><b>PROV-N Example</b></span></div>
+     <pre>
+     entity(ex:articleV1)
+     specializationOf(ex:articleV1, ex:article)
+
+     specializationOf(ex:articleV2, ex:article)
+     alternateOf(ex:articleV1, ex:articleV2)
+     </pre>
+    </div>
     <p>
      Later, after the data set is corrected and the new chart generated, a new version
      of the article is created, <code>ex:articleV2</code>, with its own URI where the article
@@ -869,17 +1125,29 @@
      is connected with the provenance of <code>ex:article</code> and <code>ex:articleV1</code>,
      the newspaper describes how these entities are related.
     </p>
-    <pre class="turtle example">
+    <div class="turtle example">
+     <div class="exampleheader">
+      <span class="exampleheader"><b>Turtle Example</b></span></div>
+     <pre>
      ex:articleV2 prov:specializationOf ex:article .
      ex:articleV2 prov:alternateOf      ex:articleV1 .
-    </pre>
+     </pre>
+    </div>
+    <div class="provn example" style="display:none">
+     <div class="exampleheader">
+      <span class="exampleheader"><b>PROV-N Example</b></span></div>
+     <pre>
+     specializationOf(ex:articleV2, ex:article)
+     alternateOf(ex:articleV1, ex:articleV2)
+     </pre>
+    </div>
     <p>
      Specialization and alternate relations connect entities, and so are visualized
      as links between them.
     </p>
     <img src="images/specialization.png" alt="Specialization and alternate links between entities"/>
    </section>
-   
+
    <section>
     <h3>Complete PROV data</h3>
     <p>
@@ -898,7 +1166,7 @@
    </p>
    <section>
     <h3>Entities</h3>
-    <pre class="example asn">
+    <pre class = "provn example">
      entity(ex:article, [dcterms:title="Crime rises in cities"])
      entity(ex:dataSet1)
      entity(ex:regionList)
@@ -909,7 +1177,7 @@
 
    <section>
     <h3>Activities</h3>
-    <pre class="example asn">
+    <pre class="provn example">
      activity(ex:compile)
      activity(ex:compose)
      activity(ex:illustrate)
@@ -918,7 +1186,7 @@
 
    <section>
     <h3>Use and Generation</h3>
-    <pre class="example asn">
+    <pre class="provn example">
      used(ex:compose, ex:dataSet1, -)
      used(ex:compose, ex:regionList, -)
      wasGeneratedBy(ex:composition, ex:compose, -)
@@ -930,7 +1198,7 @@
 
    <section>
     <h3>Agents and Responsibility</h3>
-    <pre class="example asn">
+    <pre class="provn example">
      agent(ex:derek, [ prov:type="prov:Person", foaf:givenName = "Derek", 
             foaf:mbox= "&lt;mailto:derek@example.org&gt;"])
      wasAssociatedWith(ex:compose, ex:derek, -)
@@ -950,9 +1218,9 @@
      Roles are not declared directly in PROV, rather they are attributes of 
      relations. Thus, the entire Turtle example in Section 3.5 is rendered as follows:
     </p>
-    <pre class="example asn">
+    <pre class="provn example">
      used(ex:compose, ex:dataSet1,   -, [ prov:role = "ex:dataToCompose"])
-     used(ex:compose, ex:regionList, -, [ prov:role = "ex:regionsToAggregteBy"])
+     used(ex:compose, ex:regionList, -, [ prov:role = "ex:regionsToAggregateBy"])
     </pre>
     <p>
      In the first description above, note that this adds a "role" attribute to the first 'used' description of A.3.
@@ -962,28 +1230,28 @@
 
    <section>
     <h3>Derivation and Revision</h3>
-    <pre class="example asn">
+    <pre class="provn example">
      wasRevisionOf(ex:dataSet2, ex:dataSet1, -)
     </pre>
 
-    <pre class="example asn">
+    <pre class="provn example">
      wasDerivedFrom(ex:chart2, ex:dataSet2)
     </pre>
    </section>
-   
+
    <section>
     <h3>Plans</h3>
     <p>
      Similarly to roles, plans are attributes of relations, specifically association relations.
     </p>
-    <pre class="example asn">
+    <pre class="provn example">
      wasAssociatedWith(ex:correct, ex:edith, ex:instructions)
     </pre>
    </section>
-   
+
    <section>
     <h3>Time</h3>
-    <pre class="example asn">
+    <pre class="provn example">
      wasGeneratedBy(ex:chart1, ex:compile,  2012-03-02T10:30:00)
      wasGeneratedBy(ex:chart2, ex:compile2, 2012-04-01T15:21:00)
 
@@ -993,7 +1261,7 @@
 
    <section>
     <h3>Alternate Entities and Specialization</h3>
-    <pre class="example asn">
+    <pre class="provn example">
      entity(ex:blogEntry)
      wasQuotedFrom(ex:blogEntry, ex:article)
      
@@ -1016,24 +1284,9 @@
   </section>
 
   <section class="appendix"> 
-   <h2>Changes Since First Public Working Draft</h2> 
+   <h2>Changes Since Second Public Working Draft</h2> 
    <ul>
-    <li>Removed details about "things" and attributes from intuition on entities.</li>
-    <li>Removed discussion and examples of "eventually derived from" from intuition on derivation.</li>
-    <li>Revised language and namespace prefix (ex1) to talk about a single worked example.</li>
-    <li>Updated wasControlledBy to wasAssociatedWith.</li>
-    <li>Changed (Qualified)Involvement classes and associated relations to match current ontology.</li>
-    <li>Added actedOnBehalfOf in intuition and example.</li>
-    <li>Removed the FAQ section.</li>
-    <li>Added intuition and example sections on plans.</li>
-    <li>Added intuition and example sections on time.</li>
-    <li>Added intuition and example sections on alternates and specialization.</li>
-    <li>Added intuition and examples on quotation.</li>
-    <li>Included description of attribution in intuition section on agents and responsibility.</li>
-    <li>Changed from ASN to PROV-N</li>
-    <li>Updated examples to latest PROV-O terms</li>
-    <li>Updated old PROV-N and added new PROV-N for all recently added concepts</li>
-    <li>Added provenance graph figures for the examples</li>
+    <li>Added selection between Turtle and PROV-N examples.</li>
    </ul>
   </section>